linux-next: Tree for October 29
Subsystems (2)
Hi all,
[I accidentally deleted my merge log today, so sorry to anyone who actually reads them :-), the summary still appears below.]
Changes since 20091028:
My fixes tree contains a build fix for powerpc/kvm.
The block tree lost its build failure.
The staging tree lost its conflicts.
----------------------------------------------------------------------------
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 145 trees (counting Linus' and 22 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 Jan Dittmer for adding the linux-next tree to his build tests at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 · 175 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/master Merging quilt/driver-core.current Merging quilt/tty.current Merging quilt/usb.current Merging quilt/staging.current 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 arm/devel Merging davinci/davinci-next Merging omap/for-next Merging pxa/for-next Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next CONFLICT (content): Merge conflict in drivers/rtc/Kconfig Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next Merging parisc/next Merging powerpc/next Merging 4xx/next Merging galak/next Merging s390/features Merging sh/master CONFLICT (content): Merge conflict in fs/Kconfig Merging sparc/master Merging xtensa/master 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 jfs/next Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging kbuild/master Merging kconfig/for-next Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/linux-next CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c Merging dlm/next Merging scsi/master Merging async_tx/next Merging net/master CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree. $ git rm -f drivers/net/sfc/sfe4001.c Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c Merging wireless/master CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Merging mmc/next Merging tmio-mmc/linux-next 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 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 voltage/for-next CONFLICT (content): Merge conflict in drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Makefile Merging security-testing/next CONFLICT (content): Merge conflict in Documentation/dontdiff Merging lblnet/master Merging agp/agp-next Merging uwb/for-upstream 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 drivers/acpi/video_detect.c Merging audit/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next Merging irda/for-next Merging hwlat/for-linus CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging drbd/for-jens CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c CONFLICT (add/add): Merge conflict in include/linux/drbd.h Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in drivers/net/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Merging i7core_edac/linux_next Merging devicetree/next-devicetree Merging limits/writable_limits Merging tip/auto-latest CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c Merging oprofile/for-next Merging percpu/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging quilt/driver-core Merging quilt/tty Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master
Re: linux-next: Tree for October 29 (x86 posttest)
Quoted 4 lines · On Thu, 29 Oct 2009 18:29:19 +1100 Stephen Rothwell wrote:
Hi all,
[I accidentally deleted my merge log today, so sorry to anyone who actually reads them :-), the summary still appears below.]
I'm getting this on x86_64:
TEST posttest
Error: ffffffff810299e2: f2 41 0f 28 52 b0 repnz movaps -0x50(%r10),%xmm2
Error: objdump says 6 bytes, but insn_get_length() says 4 (attr:0) make[2]: *** [posttest] Error 2
any ideas?
thanks,
---
~Randy
Re: linux-next: Tree for October 29 (x86 posttest)
Quoted 8 lines · Randy Dunlap
Quoted 4 lines · On Thu, 29 Oct 2009 18:29:19 +1100 Stephen Rothwell wrote:
Hi all,
[I accidentally deleted my merge log today, so sorry to anyone who actually reads them :-), the summary still appears below.]
Quoted 6 lines
I'm getting this on
x86_64:TEST posttest
Error:ffffffff810299e2: f2 41 0f 28 52 b0 repnz movaps -0x50(%r10),%xmm2
Error: objdump says 6 bytes, butinsn_get_length()says 4 (attr:0) make[2]: *** [posttest] Error 2
Ah, that's should be fixed by AVX support patch which I've posted.
http://git.kernel.org/tip/e0e492e99b372c6990a5daca9e4683c341f1330e
Thank you,
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: [email protected]
Re: linux-next: Tree for October 29 (x86 posttest)
Quoted 11 lines · On Thu, 29 Oct 2009 12:48:12 -0400 Masami Hiramatsu wrote:
Quoted 10 lines · Randy Dunlap
Quoted 4 lines · On Thu, 29 Oct 2009 18:29:19 +1100 Stephen Rothwell wrote:
Hi all,
[I accidentally deleted my merge log today, so sorry to anyone who actually reads them :-), the summary still appears below.]
I'm getting this on
x86_64:
Quoted 7 lines
Quoted 4 lines
TEST posttest
Error:ffffffff810299e2: f2 41 0f 28 52 b0 repnz movaps -0x50(%r10),%xmm2
Error: objdump says 6 bytes, butinsn_get_length()says 4 (attr:0) make[2]: *** [posttest] Error 2Ah, that's should be fixed by AVX support patch which I've posted.
http://git.kernel.org/tip/e0e492e99b372c6990a5daca9e4683c341f1330e
Has that been merged into linux-next?
I'm still seeing this failure in linux-next-20091106.
---
~Randy
Re: linux-next: Tree for October 29 (x86 posttest)
Quoted 18 lines · Randy Dunlap
Quoted 16 lines · On Thu, 29 Oct 2009 12:48:12 -0400 Masami Hiramatsu wrote:
Quoted 14 lines · Randy Dunlap
Quoted 4 lines · On Thu, 29 Oct 2009 18:29:19 +1100 Stephen Rothwell wrote:
Hi all,
[I accidentally deleted my merge log today, so sorry to anyone who actually reads them :-), the summary still appears below.]
I'm getting this on
x86_64:TEST posttest
Error:ffffffff810299e2: f2 41 0f 28 52 b0 repnz movaps -0x50(%r10),%xmm2
Error: objdump says 6 bytes, butinsn_get_length()says 4 (attr:0) make[2]: *** [posttest] Error 2
Quoted 5 lines
Quoted 2 lines
Ah, that's should be fixed by AVX support patch which I've posted.
http://git.kernel.org/tip/e0e492e99b372c6990a5daca9e4683c341f1330eHas that been merged into linux-next?
I'm still seeing this failure in linux-next-20091106.
I checked it has been merged.
So, it should disappear from linux-next-20091109. :-)
Thanks!
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: [email protected]
Re: linux-next: Tree for October 29 (x86 posttest)
Hi all,
Quoted 13 lines · On Mon, 09 Nov 2009 19:40:11 -0500 Masami Hiramatsu <[email protected]> wrote:
Quoted 11 lines · Randy Dunlap
Quoted 9 lines · On Thu, 29 Oct 2009 12:48:12 -0400 Masami Hiramatsu wrote:
Quoted 7 lines · Randy Dunlap
I'm getting this on
x86_64:TEST posttest
Error:ffffffff810299e2: f2 41 0f 28 52 b0 repnz movaps -0x50(%r10),%xmm2
Error: objdump says 6 bytes, butinsn_get_length()says 4 (attr:0) make[2]: *** [posttest] Error 2
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Ah, that's should be fixed by AVX support patch which I've posted.
http://git.kernel.org/tip/e0e492e99b372c6990a5daca9e4683c341f1330eHas that been merged into linux-next?
I'm still seeing this failure in linux-next-20091106.I checked it has been merged.
So, it should disappear from linux-next-20091109. :-)
That commit (e0e492e99b372c6990a5daca9e4683c341f1330e "x86: AVX instruction set decoder support") has been in linux-next since next-20091104, so if Randy's problem still existed in next-20091106, then it may be a different problem.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Re: linux-next: Tree for October 29 (x86 posttest)
Quoted 22 lines · Stephen Rothwell
Hi all,
Quoted 19 lines · On Mon, 09 Nov 2009 19:40:11 -0500 Masami Hiramatsu<[email protected]> wrote:
Quoted 16 lines · Randy Dunlap
Quoted 11 lines · On Thu, 29 Oct 2009 12:48:12 -0400 Masami Hiramatsu wrote:
Quoted 7 lines · Randy Dunlap
I'm getting this on
x86_64:TEST posttest
Error:ffffffff810299e2: f2 41 0f 28 52 b0 repnz movaps -0x50(%r10),%xmm2
Error: objdump says 6 bytes, butinsn_get_length()says 4 (attr:0) make[2]: *** [posttest] Error 2Ah, that's should be fixed by AVX support patch which I've posted.
http://git.kernel.org/tip/e0e492e99b372c6990a5daca9e4683c341f1330eHas that been merged into linux-next?
I'm still seeing this failure in linux-next-20091106.
Quoted 7 lines
Quoted 2 lines
I checked it has been merged.
So, it should disappear from linux-next-20091109. :-)That commit (
e0e492e99b372c6990a5daca9e4683c341f1330e"x86: AVX instruction set decoder support") has been in linux-next since next-20091104, so if Randy's problem still existed in next-20091106, then it may be a different problem.
Hmm, this seems a bad sequence, movaps can't have repnz prefix, since movaps is not string operation... It might happen since AVX opcodes supporting processors are not released yet.
Anyway, I think we'd better change the posttest to report it as warning instead of errors.
Thank you,
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: [email protected]
PATCH 1/1 staging: fix wireless drivers depends
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
These drivers can (erroneously) be enabled even when CONFIG_NET=n, CONFIG_NETDEVICES=n, CONFIG_WLAN=n, etc. Stop this.
--- drivers/staging/rtl8187se/Kconfig | 2 +- drivers/staging/rtl8192e/Kconfig | 2 +- drivers/staging/rtl8192su/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8187se/Kconfig +1 -1
@@ -1,6 +1,6 @@ config RTL8187SE tristate "RealTek RTL8187SE Wireless LAN NIC driver" - depends on PCI + depends on PCI && WLAN select WIRELESS_EXT select WEXT_PRIV default N
drivers/staging/rtl8192e/Kconfig +1 -1
@@ -1,6 +1,6 @@ config RTL8192E tristate "RealTek RTL8192E Wireless LAN NIC driver" - depends on PCI + depends on PCI && WLAN select WIRELESS_EXT select WEXT_PRIV default N
drivers/staging/rtl8192su/Kconfig +1 -1
@@ -1,6 +1,6 @@ config RTL8192SU tristate "RealTek RTL8192SU Wireless LAN NIC driver" - depends on PCI + depends on PCI && WLAN depends on WIRELESS_EXT default N ---help---