http://blog.gmane.org/gmane.linux.kernel.next hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://comments.gmane.org/gmane.linux.kernel.next/22662 <pre>Sorry about that. The next tree will probably be Monday (my time). </pre> Stephen Rothwell 2012-05-25T05:45:48 http://comments.gmane.org/gmane.linux.kernel.next/22661 <pre>Hi all, Please do not add anything to your linux-next included trees that is intended for v3.6 until after v3.5-rc1 is released. </pre> Stephen Rothwell 2012-05-24T22:20:43 http://comments.gmane.org/gmane.linux.kernel.next/22659 <pre>Since the watchdog code in sch56xx-common now uses the watchdog core, the Kconfig entires for the sch5627 and sch5636 should depend on WATCHDOG being set. Signed-off-by: Hans de Goede &lt;hdegoede&lt; at &gt;redhat.com&gt; --- drivers/hwmon/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 8deedc1..3d16d66 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig &lt; at &gt;&lt; at &gt; -1036,7 +1036,7 &lt; at &gt;&lt; at &gt; config SENSORS_SCH56XX_COMMON config SENSORS_SCH5627 tristate "SMSC SCH5627" -depends on !PPC +depends on !PPC &amp;&amp; WATCHDOG select SENSORS_SCH56XX_COMMON help If you say yes here you get support for the hardware monitoring &lt; at &gt;&lt; at &gt; -1048,7 +1048,7 &lt; at &gt;&lt; at &gt; config SENSORS_SCH5627 config SENSORS_SCH5636 tristate "SMSC SCH5636" -depends on !PPC +depends on !PPC &amp;&amp; WATCHDOG select SENSORS_SCH56XX_COMMON help SMSC SCH5636 Super I/O chips include an embedded microcontroller for </pre> Hans de Goede 2012-05-24T20:18:58 http://comments.gmane.org/gmane.linux.kernel.next/22650 <pre>Hi all, Changes since 20120523: With the merge window open, conflicts are moving from tree to tree. The i386 defconfig build is still broken. The sound-current tree lost its conflicts. The hexagon tree lost its conflict. The target-merge tree lost its conflicts. The crypto tree lost its conflicts. The cgroup tree lost its conflict. The mfd tree lost its build failure. The watchdog tree lost its build failure. The trivial tree lost its conflicts. The tip tree lost a few conflicts. The percpu tree lots its conflict. The arm-soc tree lost several conflicts. The signal tree gained conflicts against the tip tree and Linus' tree. The akpm tree lost several patches to the signal tree. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "g</pre> Stephen Rothwell 2012-05-24T06:49:15 http://comments.gmane.org/gmane.linux.kernel.next/22649 <pre>Hi Al, Today's linux-next merge of the signal tree got a conflict in kernel/irq/manage.c between commit f5d89470f91f ("genirq: Be more informative on irq type mismatch") from Linus' tree and commit 501a0effacfa ("genirq: reimplement exit_irq_thread() hook via task_work_add()") from the signal tree. The latter removed the code modified by the former, so I did that. </pre> Stephen Rothwell 2012-05-24T05:54:53 http://comments.gmane.org/gmane.linux.kernel.next/22644 <pre>Hi all, This commit: ------ commit c55c89e939f2a0a83d5c61462be554d5d2408178 Author: Sonic Zhang &lt;sonic.zhang&lt; at &gt;analog.com&gt; Date: Thu Nov 24 17:40:07 2011 +0800 blackfin: twi: move twi bit mask macro to twi head file Signed-off-by: Sonic Zhang &lt;sonic.zhang&lt; at &gt;analog.com&gt; Signed-off-by: Bob Liu &lt;lliubbo&lt; at &gt;gmail.com&gt; ------ seems to break linux-next builds, such as this: http://kisskb.ellerman.id.au/kisskb/buildresult/6353497/ Please have a look, thanks. Paul. </pre> Paul Gortmaker 2012-05-24T00:59:40 http://comments.gmane.org/gmane.linux.kernel.next/22625 <pre>Hi all, Changes since 20120522: New tree: signal With the merge window open, conflicts are moving from tree to tree. The i386 defconfig build is still broken. The nfs tree lost its conflict. The rr tree gained a conflict against Linus' tree. The mmc tree lost its conflict. The mfd tree gained a conflict against Linus' tree and still has its build failure so I used the version from next-20120511. The security tree lost its conflicts. The watchdog tree lost its conflict but gained a build failure for which I applied a patch. The trivial tree lost a conflict. The edac tree lost its conflict. The tip tree lost a conflict. The usb tree lost its conflicts. The staging tree lost its conflicts. The char-misc tree lost its conflict. The arm-soc tree lost lots of conflicts. The signal tree gained a conflict against the tip tree. The akpm tree lost several patches to the new signal tree. ---------------------------------------------------------------------------- I have created today's linux-next t</pre> Stephen Rothwell 2012-05-23T07:07:40 http://comments.gmane.org/gmane.linux.kernel.next/22621 <pre>Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/um/Kconfig.common between commit 875c9d09b5a6 ("um: Use generic time config") from the tip tree and commit 985a94a96d29 ("um: Remove CONFIG_IRQ_RELEASE_METHOD") from the signal tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. </pre> Stephen Rothwell 2012-05-23T06:02:33 http://comments.gmane.org/gmane.linux.kernel.next/22618 <pre>Sorry for not having done that earlier; the tree is at git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal #for-next. No non-trivial conflicts with akpm-base - only arch/*/Kconfig ones coming from mainline. A _lot_ of duplicates with akpm - 20 commits from Matt and Oleg are all cherry-picked from there. I've included the recent uml.git pull request in there - it's not in -next (and probably ought to be) and this time it has a lot to do with the stuff being dealt with here. I hope to get task_work_add() series through that tree, once all prereqs are there; I'll send heads-up before doing that, since those patches are currently in akpm's patchset (and unfortunately they do need a bunch of commits not in there to get them working on all architectures - some of those prereqs are in this branch, some will need to be moved to it from signal.git#master) </pre> Al Viro 2012-05-23T05:22:35 http://comments.gmane.org/gmane.linux.kernel.next/22615 <pre>Hi Samuel, Today's linux-next merge of the mfd tree got a conflict in drivers/mfd/Makefile between commits dece3709b71a ("mfd/db5500-prcmu: delete DB5500 PRCMU support") and 72fb92200d6c ("mfd/ab5500: delete AB5500 support") from Linus' tree and commit d28f1db8187d ("mfd: Remove confusing ab8500-i2c file and merge into ab8500-core") from the mfd tree. I fixed it up (see below) and can carry the fix as necessary. </pre> Stephen Rothwell 2012-05-23T03:01:54 http://comments.gmane.org/gmane.linux.kernel.next/22614 <pre>Hi Jens, Commit 21731057017b ("Merge branch 'for-3.5/drivers' into for-next") has left a conflict marker in Documentation/feature-removal-schedule.txt ... </pre> Stephen Rothwell 2012-05-23T02:35:07 http://comments.gmane.org/gmane.linux.kernel.next/22612 <pre>This idea is inspired from IA64 implementation. It is like NAPI for network stack. When CMCI is too many to handle, this interrupt can be disabled and then poll mode will take over the events handle. When no more events happen in the system, CMC interrupt can be enabled automatically. Signed-off-by: Chen Gong &lt;gong.chen&lt; at &gt;linux.intel.com&gt; --- arch/x86/kernel/cpu/mcheck/mce.c | 83 +++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index d086a09..6334f0d 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c &lt; at &gt;&lt; at &gt; -92,6 +92,7 &lt; at &gt;&lt; at &gt; static char*mce_helper_argv[2] = { mce_helper, NULL }; static DECLARE_WAIT_QUEUE_HEAD(mce_chrdev_wait); +static DEFINE_PER_CPU(struct timer_list, mce_timer); static DEFINE_PER_CPU(struct mce, mces_seen); static intcpu_missing; &lt; at &gt;&lt; at &gt; -100,8 +101,28 &lt; at &gt;&lt; at &gt; DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = { [0 ... BITS_TO_LONGS(MAX_NR_</pre> Chen Gong 2012-05-23T02:30:25 http://comments.gmane.org/gmane.linux.kernel.next/22611 <pre>Hi Rusty, Today's linux-next merge of the rr tree got a conflict in Documentation/virtual/virtio-spec.txt between commit 33950c6e2269 ("virtio: update documentation to v0.9.5 of spec") from Linus' tree and commit e26259736de5 ("virtio: update documentation to v0.9.4 of spec") from the rr tree. I just used the version from Linus' tree. </pre> Stephen Rothwell 2012-05-23T02:15:18 http://comments.gmane.org/gmane.linux.kernel.next/22609 <pre>With the merge window open, it is as good a time as any to catch up on the failures in linux-next. Please have a look to see if any of these build failures might be related to your commits. --------------------- New breakage since last report: ARM:netx_defconfig (mach-netx/fb.c: redefinition of 'clk_disable') ARM:u8500_defconfig (No rule to make `arch/arm/mach-ux500/pins.o') ARM:imx_v4_v5_defconfig (video/mx2_camera.c: 'pixfmt' undeclared) ARM:tegra_defconfig (tegra-smmu.c: implicit decl 'of_get_dma_window') blackfin: (implicit declaration of function 'UART_PUT_CLK') ia64: (kernel/sched/numa.c: initializer element is not constant) sh4: (kernel/process.c:23: implicit decl of function 'unlazy_fpu') Randconfig fails that may or may not be new (by their very nature): i386: include/asm/uaccess_32.h: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct [fs/binfmt_misc.o] Error 1 Builds that are fixed since last report: ARM</pre> Paul Gortmaker 2012-05-23T01:04:57 http://comments.gmane.org/gmane.linux.kernel.next/22607 <pre>Hi Olof, This change: - id.o usb.o timer.o + id.o pins.o usb.o timer.o breaks the u8500_defconfig as follows: make[2]: *** No rule to make target `arch/arm/mach-ux500/pins.o', needed by `arch/arm/mach-ux500/built-in.o'. Stop. make[1]: *** [arch/arm/mach-ux500/] Error 2 make: *** [sub-make] Error 2 A bisect shows the following: cda6f4d8cae969e08e6662573b538db73191873b is the first bad commit commit cda6f4d8cae969e08e6662573b538db73191873b Author: Olof Johansson &lt;olof&lt; at &gt;lixom.net&gt; Date: Wed May 16 14:47:24 2012 -0700 ARM: ux500: fix mismerge in for-next Signed-off-by: Olof Johansson &lt;olof&lt; at &gt;lixom.net&gt; :040000 040000 abc42227f7daa6a7ff6153e0908add25ffb38a54 45d2618822e6075aea188089191791091c2e5c38 M arch bisect run success The linux-next fail is here: http://kisskb.ellerman.id.au/kisskb/buildresult/6348609/ Can you have a look please? Thanks, Paul. </pre> Paul Gortmaker 2012-05-23T00:03:46 http://comments.gmane.org/gmane.linux.kernel.next/22606 <pre>Hi Viresh, The above listed commit, in linux-next as: commit ebbf0cb5d39cc3e22ef4c425475e76b7f45027de "clk: add non CONFIG_HAVE_CLK routines" shows up as failures in the netx_defconfig, since there are duplicate stub functions between your changes and the file below: arch/arm/mach-netx/fb.c:72:6: error: redefinition of 'clk_disable' include/linux/clk.h:299:51: note: previous definition of 'clk_disable' was here arch/arm/mach-netx/fb.c:76:5: error: redefinition of 'clk_set_rate' include/linux/clk.h:306:50: note: previous definition of 'clk_set_rate' was here arch/arm/mach-netx/fb.c:81:5: error: redefinition of 'clk_enable' include/linux/clk.h:294:50: note: previous definition of 'clk_enable' was here arch/arm/mach-netx/fb.c:86:13: error: redefinition of 'clk_get' include/linux/clk.h:280:58: note: previous definition of 'clk_get' was here arch/arm/mach-netx/fb.c:91:6: error: redefinition of 'clk_put' include/linux/clk.h:290:51: note: previous definition of 'clk_put' was here make</pre> Paul Gortmaker 2012-05-22T23:46:22 http://comments.gmane.org/gmane.linux.kernel.next/22601 <pre>Hi Tejun, The top commit of the cgroup tree (e4968362bd46 "WIP") should not be in linux-next. In fact it looks like you committed your quilt series by accident. I will use the cgroup tree from next-20120522 for today. </pre> Stephen Rothwell 2012-05-22T22:34:37 http://comments.gmane.org/gmane.linux.kernel.next/22588 <pre>Hi all, Changes since 201205018: With the merge window open, conflicts are moving from tree to tree. The i386 defconfig build is still broken and now the sparc32 defconfig is broken as well. The ceph tree gained a conflict against Linus' tree. The nfs tree gained a conflict against Linus' tree. The infiniband tree lost its build failure. The net-next tree lost its conflicts. The mfd tree gained conflicts against Linus' tree and still has its build failure so I used the version from next-20120511. The trivial tree gained conflicts against Linus' tree and the mips tree. The tip tree gained a conflict against Linus' tree. I also added a patch for a PowerPC boot problem. The kvm-ppc tree lost its conflict. The usb tree lost its build failure. The userns tree gained a conflict against Linus' tree. The akpm tree lost a conflict. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/l</pre> Stephen Rothwell 2012-05-22T08:30:37 http://comments.gmane.org/gmane.linux.kernel.next/22586 <pre>Hi all, After merging the final tree, today's linux-next build (sparc32 defconfig) failed like this: arch/sparc/kernel/time_32.c: In function 'timer_interrupt': arch/sparc/kernel/time_32.c:105:3: error: invalid use of undefined type 'struct clock_event_device' arch/sparc/kernel/time_32.c: At top level: arch/sparc/kernel/time_32.c:111:17: error: 'enum clock_event_mode' declared inside parameter list [-Werror] arch/sparc/kernel/time_32.c:111:17: error: its scope is only this definition or declaration, which is probably not what you want [-Werror] arch/sparc/kernel/time_32.c:110:53: error: parameter 1 ('mode') has incomplete type arch/sparc/kernel/time_32.c:110:13: error: function declaration isn't a prototype [-Werror=strict-prototypes] arch/sparc/kernel/time_32.c: In function 'timer_ce_set_mode': arch/sparc/kernel/time_32.c:114:8: error: 'CLOCK_EVT_MODE_PERIODIC' undeclared (first use in this function) arch/sparc/kernel/time_32.c:114:8: note: each undeclared identifier is reported only once for each functio</pre> Stephen Rothwell 2012-05-22T08:20:10 http://comments.gmane.org/gmane.linux.kernel.next/22585 <pre>Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/stat.c between commit a52dd971f947 ("vfs: de-crapify "cp_new_stat()" function") from Linus' tree and commit a7c1938e22c0 ("userns: Convert stat to return values mapped from kuids and kgids") from the userns tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. </pre> Stephen Rothwell 2012-05-22T07:44:26 http://comments.gmane.org/gmane.linux.kernel.next/22584 <pre>Hi all, Today's linux-next merge of the tip tree got a conflict in mm/memory.c between commit 4f74d2c8e827 ("vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces") from Linus' tree and commit cbc91f71b51b ("uprobes/core: Decrement uprobe count before the pages are unmapped") from the tip tree. Following discussion between Linus and Andred, I fixed it up as below for now. </pre> Stephen Rothwell 2012-05-22T05:44:11 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.linux.kernel.next