linux-next: Tree for November 19
Subsystems (2)
Hi all,
Changes since 20101118:
The v4l-dvb tree still has its build failure, so I used the version from next-20101112.
The net tree gained conflicts against the net-current tree.
The bluetooth tree lost its build failure.
The alacrity tree gained a conflict against Linus' tree.
The bkl-config tree gained a conflict against Linus' tree.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below).
You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 179 trees (counting Linus' and 26 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
Signature · 207 lines
Cheers, Stephen Rothwell [email protected] $ git checkout master $ git reset --hard stable Merging origin/master Merging fixes/fixes Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging sparc-current/master Merging scsi-rc-fixes/master Merging net-current/master Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/rc-fixes Merging driver-core.current/driver-core-linus Merging tty.current/tty-linus Merging usb.current/usb-linus Merging staging.current/staging-linus Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus Merging crypto-current/master Merging ide-curent/master Merging dwmw2/master Merging sh-current/sh-fixes-for-linus Merging rmobile-current/rmobile-fixes-for-linus Merging fbdev-current/fbdev-fixes-for-linus Merging gcl-current/merge Merging arm/devel Merging davinci/davinci-next Merging i.MX/for-next Merging msm/for-next Merging omap/for-next Merging pxa/for-next Merging samsung/next-samsung Merging s5p/for-next Merging tegra/for-next Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next Merging parisc/next Merging powerpc/next Merging 4xx/next Merging 52xx-and-virtex/next Merging galak/next Merging s390/features Merging sh/sh-latest Merging rmobile/rmobile-latest Merging sparc/master Merging tile/master Merging xtensa/master CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Merging ceph/for-next Merging cifs/master Merging configfs/linux-next Merging ecryptfs/next Merging ext3/for_next Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging hfsplus/for-next Merging jfs/next Merging logfs/master CONFLICT (content): Merge conflict in fs/logfs/logfs.h Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging omfs/for-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Merging vfs/for-next Merging pci/linux-next CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c Merging hid/for-next CONFLICT (content): Merge conflict in drivers/hid/hid-input.c Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging hwmon-staging/hwmon-next Merging quilt/kernel-doc Merging v4l-dvb/master $ git reset --hard HEAD^ Merging refs/next/20101112/v4l-dvb Merging kbuild/for-next Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging idle-test/idle-test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next Merging dlm/next Merging swiotlb/master Merging ibft/master Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (content): Merge conflict in drivers/net/bonding/bond_main.c CONFLICT (content): Merge conflict in net/core/net-sysfs.c CONFLICT (content): Merge conflict in net/ipv6/addrconf.c Merging wireless/master Merging bluetooth/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging sound-asoc/for-next Merging cpufreq/next Merging quilt/rr Merging input/next Merging lsm/for-next Merging block/for-next Merging quilt/device-mapper Merging embedded/master Merging firmware/master Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging mmc/mmc-next Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging fbdev/master Merging viafb/viafb-next Merging omap_dss2/for-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master Merging agp/agp-next Merging watchdog/master Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree. CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree. CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c $ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h Merging audit/for-next Merging suspend/linux-next Merging fsnotify/for-next Merging irda/for-next Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging i7300_edac/linux_next Merging devicetree/next-devicetree Merging spi/next-spi Merging tip/auto-latest Merging rcu/rcu/next Merging oprofile/for-next Merging xen/upstream/xen Merging swiotlb-xen/master Merging xen-pvhvm/linux-next Merging edac-amd/for-next Merging percpu/for-next Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging drivers-x86/linux-next Merging hwpoison/hwpoison Merging sysctl/master Merging driver-core/driver-core-next Merging tty/tty-next Merging usb/usb-next Merging staging/staging-next Merging slabh/slabh Merging bkl-trivial/trivial Merging bkl-llseek/llseek Merging bkl-vfs/vfs Merging bkl-config/config CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c CONFLICT (content): Merge conflict in include/linux/hardirq.h CONFLICT (content): Merge conflict in include/linux/smp_lock.h Merging irqflags/master Merging cleancache/linux-next CONFLICT (content): Merge conflict in fs/ocfs2/super.c CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in mm/Kconfig Merging scsi-post-merge/merge-base:master
Re: linux-next: Tree for November 19 (sched_fair)
Quoted 3 lines · On Fri, 19 Nov 2010 14:32:07 +1100 Stephen Rothwell wrote:
Hi all,
Changes since 20101118:
when CONFIG_SMP is not enabled:
kernel/sched_fair.c:566: error: 'struct cfs_rq' has no member named 'load_unacc_exec_time' kernel/sched_fair.c:567: error: 'struct cfs_rq' has no member named 'load_unacc_exec_time'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: linux-next: Tree for November 19 (rtmutex)
In reply to Stephen RothwellQuoted 3 lines · On Fri, 19 Nov 2010 14:32:07 +1100 Stephen Rothwell wrote:
Hi all,
Changes since 20101118:
when CONFIG_RT_MUTEXES is not enabled:
kernel/rtmutex_common.h:81: error: 'struct task_struct' has no member named 'pi_waiters' kernel/rtmutex_common.h:87: error: 'struct task_struct' has no member named 'pi_waiters'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: linux-next: Tree for November 19 (rtmutex)
Quoted 11 lines · On Fri, 19 Nov 2010 09:16:29 -0800 Randy Dunlap wrote:
Quoted 3 lines · On Fri, 19 Nov 2010 14:32:07 +1100 Stephen Rothwell wrote:
Hi all,
Changes since 20101118:
when
CONFIG_RT_MUTEXESis not enabled:
kernel/rtmutex_common.h:81: error: 'structtask_struct' has no member named 'pi_waiters'kernel/rtmutex_common.h:87: error: 'structtask_struct' has no member named 'pi_waiters'
This build error still occurs in linux-next 20101202.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
PATCH 1/1 staging: fix winbond build, needs delay.h
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
winbond drivers use msleep() and delay(), so include linux/delay.h in a common header file to prevent build errors.
drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep' drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay' drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep' drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'
--- drivers/staging/winbond/sysdef.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/winbond/sysdef.h +3 -0
@@ -2,6 +2,9 @@#ifndef SYS_DEF_H #define SYS_DEF_H + +#include <linux/delay.h> +#define WB_LINUX #define WB_LINUX_WPA_PSK
Re: [PATCH -next] staging: fix winbond build, needs delay.h
Quoted 11 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
winbond drivers use
msleep()anddelay(), so includelinux/delay.hin a common header file to prevent build errors.
drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep'drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay'drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep'drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'Signed-off-by Randy Dunlap <[email protected]>
Ack.
Quoted 16 lines
--- drivers/staging/winbond/sysdef.h | 3 +++ 1 file changed, 3 insertions(+)drivers/staging/winbond/sysdef.h +3
-0@@ -2,6 +2,9 @@#ifndef SYS_DEF_H #define SYS_DEF_H + +#include <linux/delay.h> +#define WB_LINUX #define WB_LINUX_WPA_PSK
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH -next] staging: fix winbond build, needs delay.h
In reply to Randy DunlapQuoted 9 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
winbond drivers use
msleep()anddelay(), so includelinux/delay.hin a common header file to prevent build errors.
drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep'drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay'drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep'drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'
Is this error showing up in Linus's tree, or only in linux-next?
thanks,
greg k-h
Re: [PATCH -next] staging: fix winbond build, needs delay.h
Quoted 6 lines · Greg KH
Quoted 5 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
winbond drivers use
msleep()anddelay(), so includelinux/delay.hin a common header file to prevent build errors.
Quoted 6 lines
Quoted 4 lines
drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep'drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay'drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep'drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'Is this error showing up in Linus's tree, or only in linux-next?
I saw it in linux-next, but it looks like it should also be a build error in mainline.
Signature · 2 lines
~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: [PATCH -next] staging: fix winbond build, needs delay.h
Quoted 12 lines · Randy Dunlap
Quoted 11 lines · Greg KH
Quoted 9 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
winbond drivers use
msleep()anddelay(), so includelinux/delay.hin a common header file to prevent build errors.
drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep'drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay'drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep'drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'
Quoted 4 lines
Quoted 1 line
Is this error showing up in Linus's tree, or only in linux-next?
I saw it in linux-next, but it looks like it should also be a build error in mainline.
Ok, thanks, I'll queue it up for Linus's tree then.
greg k-h
Salve,
2010/11/19 Stephen Rothwell <[email protected]>:
Quoted 3 lines
Hi all,
Changes since 20101118:
This probably should not be available on x86_64
BLD FW drivers/net/wan/wanxlfw.inc/bin/sh: as68k: command not found /home/test/linux-2.6/drivers/net/wan/wanxlfw.S:39:0: fatal error: when writing output to : Broken pipe
compilation terminated.
make[4]: *** [drivers/net/wan/wanxlfw.inc] Error 127 make[3]: *** [drivers/net/wan] Error 2
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2
Am I right?
Signature · 9 lines
Slawa! N.P.S. Chwała tobie, Szatanie, cześć na wysokościach Nieba, gdzie królowałeś, chwała w głębokościach Piekła, gdzie zwyciężony, trwasz w dumnym milczeniu! Uczyń, niechaj ma dusza spocznie z Tobą w cieniu Drzewa Wiedzy, gdy swoje konary rozwinie, Jak sklepienie kościoła, który nie przeminie!
Quoted 7 lines · On Fri, 19 Nov 2010 18:40:41 +0100 Zimny Lech…
Salve,
2010/11/19 Stephen Rothwell <[email protected]>:
Quoted 3 lines
Hi all,
Changes since 20101118:
Quoted 8 lines
This probably should not be available on
x86_64BLD FW
drivers/net/wan/wanxlfw.inc/bin/sh: as68k: command not found/home/test/linux-2.6/drivers/net/wan/wanxlfw.S:39:0: fatal error: when writing output to : Broken pipe
compilation terminated.
make[4]: *** [drivers/net/wan/wanxlfw.inc] Error 127
If you want to build the wanxl firmware then you need the m68k assembler for the firmware, so it is right.
2010/11/19 Alan Cox <[email protected]>:
Quoted 19 lines
Quoted 7 lines · On Fri, 19 Nov 2010 18:40:41 +0100 Zimny Lech…
Salve,
2010/11/19 Stephen Rothwell <[email protected]>:
Quoted 3 lines
Hi all,
Changes since 20101118:
Quoted 8 lines
This probably should not be available on
x86_64BLD FW drivers/net/wan/wanxlfw.inc
/bin/sh: as68k: command not found/home/test/linux-2.6/drivers/net/wan/wanxlfw.S:39:0: fatal error: when writing output to : Broken pipe
compilation terminated.
make[4]: *** [drivers/net/wan/wanxlfw.inc] Error 127
Quoted 3 lines
If you want to build the wanxl firmware then you need the m68k assembler for the firmware, so it is right.
Ok, thanks for the info.
I'll try to find souces for this asm and install it to avoid future failed builds.
Signature · 9 lines
Slawa! N.P.S. Chwała tobie, Szatanie, cześć na wysokościach Nieba, gdzie królowałeś, chwała w głębokościach Piekła, gdzie zwyciężony, trwasz w dumnym milczeniu! Uczyń, niechaj ma dusza spocznie z Tobą w cieniu Drzewa Wiedzy, gdy swoje konary rozwinie, Jak sklepienie kościoła, który nie przeminie!
Hi,
2010/11/19 Stephen Rothwell <[email protected]>:
Quoted 3 lines
Hi all,
Changes since 20101118:
I do not recall that I saw it before
CC [M] drivers/block/cciss.o/home/test/linux-2.6/drivers/block/cciss.c: In function 'cciss_cleanup':/home/test/linux-2.6/drivers/block/cciss.c:4929:6: error: 'proc_cciss' undeclared (first use in this function) /home/test/linux-2.6/drivers/block/cciss.c:4929:6: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [drivers/block/cciss.o] Error 1
make[2]: *** [drivers/block] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2
Signature · 9 lines
Slawa! N.P.S. Chwała tobie, Szatanie, cześć na wysokościach Nieba, gdzie królowałeś, chwała w głębokościach Piekła, gdzie zwyciężony, trwasz w dumnym milczeniu! Uczyń, niechaj ma dusza spocznie z Tobą w cieniu Drzewa Wiedzy, gdy swoje konary rozwinie, Jak sklepienie kościoła, który nie przeminie!
W dniu 20 listopada 2010 06:50 użytkownik Zimny Lech
Quoted 7 lines · <[email protected]> napisał:
Hi,
2010/11/19 Stephen Rothwell <[email protected]>:
Quoted 3 lines
Hi all,
Changes since 20101118:
Quoted 13 lines
I do not recall that I saw it before
CC [M] drivers/block/cciss.o/home/test/linux-2.6/drivers/block/cciss.c: In function 'cciss_cleanup':/home/test/linux-2.6/drivers/block/cciss.c:4929:6: error: 'proc_cciss' undeclared (first use in this function)/home/test/linux-2.6/drivers/block/cciss.c:4929:6: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [drivers/block/cciss.o] Error 1
make[2]: *** [drivers/block] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2
BTW. mainline too I guess
Signature · 9 lines
Slawa! N.P.S. Chwała tobie, Szatanie, cześć na wysokościach Nieba, gdzie królowałeś, chwała w głębokościach Piekła, gdzie zwyciężony, trwasz w dumnym milczeniu! Uczyń, niechaj ma dusza spocznie z Tobą w cieniu Drzewa Wiedzy, gdy swoje konary rozwinie, Jak sklepienie kościoła, który nie przeminie!
Quoted 23 lines · Zimny Lech
W dniu 20 listopada 2010 06:50 użytkownik Zimny Lech
Quoted 7 lines · <[email protected]> napisał:
Hi,
2010/11/19 Stephen Rothwell <[email protected]>:
Quoted 3 lines
Hi all,
Changes since 20101118:
Quoted 13 lines
I do not recall that I saw it before
CC [M]drivers/block/cciss.o/home/test/linux-2.6/drivers/block/cciss.c: In function 'cciss_cleanup':/home/test/linux-2.6/drivers/block/cciss.c:4929:6: error: 'proc_cciss' undeclared (first use in this function)/home/test/linux-2.6/drivers/block/cciss.c:4929:6: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [drivers/block/cciss.o] Error 1
make[2]: *** [drivers/block] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2
Quoted 1 line
BTW. mainline too I guess
A fix for this is queued up in for-linus, it'll go out shortly.
Signature · 1 line
Jens Axboe
Hi,
2010/11/19 Stephen Rothwell <[email protected]>:
Quoted 4 lines
Hi all,
Changes since 20101118:
CC kernel/sched.o
In file included from /home/test/linux-2.6/kernel/sched.c:1869:0:/home/test/linux-2.6/kernel/sched_fair.c: In function '__update_curr':/home/test/linux-2.6/kernel/sched_fair.c:566:8: error: 'struct cfs_rq' has no member named 'load_unacc_exec_time' /home/test/linux-2.6/kernel/sched_fair.c:567:12: error: 'struct cfs_rq' has no member named 'load_unacc_exec_time'
make[2]: *** [kernel/sched.o] Error 1
make[1]: *** [kernel] Error 2
make: *** [sub-make] Error 2
Signature · 9 lines
Slawa! N.P.S. Chwała tobie, Szatanie, cześć na wysokościach Nieba, gdzie królowałeś, chwała w głębokościach Piekła, gdzie zwyciężony, trwasz w dumnym milczeniu! Uczyń, niechaj ma dusza spocznie z Tobą w cieniu Drzewa Wiedzy, gdy swoje konary rozwinie, Jak sklepienie kościoła, który nie przeminie!