linux-next: Tree for September 29
Subsystems (2)
Hi all,
Changes since 20090928:
My fixes tree contains a build fix for powerpc/kvm.
I have still reverted a commit from the scsi tree that causes a boot failure.
I have still added a patch to remove includes of autoconf.h that were causing some build failures.
----------------------------------------------------------------------------
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 139 trees (counting Linus' and 21 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 · 176 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 CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h 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/for-next Merging pxa/for-next Merging thumb-2/thumb-2 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 CONFLICT (content): Merge conflict in arch/mips/Kconfig CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree. CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree. CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree. $ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c Merging parisc/next CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c Merging powerpc/next Merging 4xx/next Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master 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 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 quota/for_next 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 Merging dlm/next Merging scsi/master $ git am -3 ../patches/0001-Revert-SCSI-scsi_lib_dma.c-fix-bug-w-dma-maps-on-vir.patch Applying: Revert "[SCSI] scsi_lib_dma.c : fix bug /w dma maps on virtual vc ports" Merging async_tx/next Merging net/master Merging wireless/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Merging mmc/next Merging input/next Merging lsm/for-next Merging block/for-next CONFLICT (content): Merge conflict in fs/fs-writeback.c CONFLICT (content): Merge conflict in mm/page-writeback.c 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 Merging security-testing/next 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 Merging audit/for-next Merging omap/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging fsnotify/for-next Merging irda/for-next Merging hwlat/for-linus Merging drbd/drbd Merging kmemleak/kmemleak Merging tip/auto-latest 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 CONFLICT (content): Merge conflict in arch/x86/kernel/early_printk.c CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c Merging quilt/staging Merging scsi-post-merge/master CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.h CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_elsct.c CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.h CONFLICT (content): Merge conflict in include/scsi/fc_encode.h CONFLICT (content): Merge conflict in include/scsi/libfc.h CONFLICT (content): Merge conflict in kernel/sysctl.c Applying: linux-next: 20090926 - drop autoconf.h from DRBD driver
PATCH 1/1 linux-next: 20090929 - android driver build breaks
Hi Greg,
next-20090929 randconfig build breaks withCONFIG_ANDROID_LOW_MEMORY_KILLER=y
drivers/staging/android/lowmemorykiller.c: In function 'lowmem_shrink':drivers/staging/android/lowmemorykiller.c:111: error: 'struct mm_struct' has no member named 'oom_adj' make[3]: *** [drivers/staging/android/lowmemorykiller.o] Error 1
Commit 0753ba01e126020bf0f8150934903b48935b697d was reverted back, which moves back oom_adj from mm_struct to task_struct and commit 28b83c5193e7ab951e402252278f2cc79dc4d298 moved the oomkilladj from task_struct to signal_struct.
Following patch reverts the changes introduced by commit a6a9f81ccc9f5c86ccc22bbed1960a57d0316e8b to drivers/staging/android/lowmemorykiller.c
--
drivers/staging/android/lowmemorykiller.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/android/lowmemorykiller.c +3 -5
@@ -99,21 +99,19 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)read_lock (&tasklist_lock);for_each_process (p) { -struct mm_struct *mm;int oom_adj;task_lock (p); - mm = p->mm; -if (!mm) { +if (!p->mm) {task_unlock (p);continue ; } - oom_adj = mm->oom_adj; + oom_adj = p->signal->oom_adj;if (oom_adj < min_adj) {task_unlock (p);continue ; } - tasksize =get_mm_rss (mm); + tasksize =get_mm_rss (p->mm);task_unlock (p);if (tasksize <=0 )continue ;
Kamalesh
Re: [PATCH] linux-next: 20090929 - android driver build breaks
Quoted 9 lines · Kamalesh Babulal
Hi Greg,
next-20090929 randconfig build breaks with
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
drivers/staging/android/lowmemorykiller.c: In function 'lowmem_shrink':drivers/staging/android/lowmemorykiller.c:111: error: 'structmm_struct' has no member named 'oom_adj' make[3]: *** [drivers/staging/android/lowmemorykiller.o] Error 1
Quoted 8 lines
Commit
0753ba01e126020bf0f8150934903b48935b697dwas reverted back, which moves backoom_adjfrommm_structtotask_structand commit28b83c5193e7ab951e402252278f2cc79dc4d298moved the oomkilladj fromtask_structtosignal_struct.Following patch reverts the changes introduced by commit
a6a9f81ccc9f5c86ccc22bbed1960a57d0316e8btodrivers/staging/android/lowmemorykiller.c
Ick, what a mess. I'll queue this up, thanks.
greg k-h
Re: [PATCH] linux-next: 20090929 - android driver build breaks
In reply to Kamalesh BabulalQuoted 4 lines · Kamalesh Babulal
Hi Greg,
next-20090929 randconfig build breaks with
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
Due to no support from Google, I've dropped the android code from the staging tree for 2.6.33.
thanks,
greg k-h
Re: [PATCH] linux-next: 20090929 - android driver build breaks
Quoted 8 lines · Greg KH
Quoted 4 lines
Hi Greg,
next-20090929 randconfig build breaks with
CONFIG_ANDROID_LOW_MEMORY_KILLER=yDue to no support from Google, I've dropped the android code from the staging tree for 2.6.33.
What are you specifically referring to? Kamalesh provided a patch[*] that fixes this particular compile error, which you said you were queueing.
If it's a criticism of the staleness of the Android code within the staging tree or no recent activity, then we should probably loop in some Android developers to find our about their plans. I've added them to the cc.
Re: [PATCH] linux-next: 20090929 - android driver build breaks
Quoted 7 lines · David Rientjes
Quoted 5 lines · Greg KH
Quoted 4 lines
Hi Greg,
next-20090929 randconfig build breaks with
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
Quoted 6 lines
Quoted 3 lines
Due to no support from Google, I've dropped the android code from the staging tree for 2.6.33.
What are you specifically referring to? Kamalesh provided a patch[*] that fixes this particular compile error, which you said you were queueing.
Hm, I did say I was queueing it, but I still can't figure out if this is needed for the 2.6.32 tree. Is it?
Quoted 4 lines
If it's a criticism of the staleness of the Android code within the staging tree or no recent activity, then we should probably loop in some Android developers to find our about their plans. I've added them to the cc.
They know all about this and agreed that the code should be dropped for 2.6.33 if no one sends me patches. If someone does, then I will remove my 'delete the android code' patch in the staging tree.
Honestly, I'm not holding my breath :(
thanks,
greg k-h
Re: [PATCH] linux-next: 20090929 - android driver build breaks
Quoted 6 lines · Greg KH
Quoted 2 lines
What are you specifically referring to? Kamalesh provided a patch[*] that fixes this particular compile error, which you said you were queueing.
Hm, I did say I was queueing it, but I still can't figure out if this is needed for the 2.6.32 tree. Is it?
Yes, 28b83c5 was merged during the merge window for 2.6.32 so this needs to be pushed for the staging tree if it's not ripped out.
Quoted 9 lines
Quoted 4 lines
If it's a criticism of the staleness of the Android code within the staging tree or no recent activity, then we should probably loop in some Android developers to find our about their plans. I've added them to the cc.
They know all about this and agreed that the code should be dropped for 2.6.33 if no one sends me patches. If someone does, then I will remove my 'delete the android code' patch in the staging tree.
I don't work with Android, but the "no support from Google" phrase caught my attention :) It seems like this isn't necessarily about support or raised issues not being addressed, but rather about a lack of progress being made developmentally or a general lack of interest in upstream inclusion. If it was agreed to simply remove it, that's fine, I just was curious about the rationale.
Re: [PATCH] linux-next: 20090929 - android driver build breaks
Quoted 11 lines · David Rientjes
Quoted 6 lines · Greg KH
Quoted 2 lines
What are you specifically referring to? Kamalesh provided a patch[*] that fixes this particular compile error, which you said you were queueing.
Hm, I did say I was queueing it, but I still can't figure out if this is needed for the 2.6.32 tree. Is it?
Yes, 28b83c5 was merged during the merge window for 2.6.32 so this needs to be pushed for the staging tree if it's not ripped out.
Ok, I'll dig it up, thanks.
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines
If it's a criticism of the staleness of the Android code within the staging tree or no recent activity, then we should probably loop in some Android developers to find our about their plans. I've added them to the cc.
They know all about this and agreed that the code should be dropped for 2.6.33 if no one sends me patches. If someone does, then I will remove my 'delete the android code' patch in the staging tree.
Quoted 5 lines
I don't work with Android, but the "no support from Google" phrase caught my attention :) It seems like this isn't necessarily about support or raised issues not being addressed, but rather about a lack of progress being made developmentally or a general lack of interest in upstream inclusion.
Yes, that is exactly correct.
thanks,
greg k-h
Re: [PATCH] linux-next: 20090929 - android driver build breaks
In reply to Greg KHQuoted 11 lines
Quoted 5 lines
If it's a criticism of the staleness of the Android code within the staging tree or no recent activity, then we should probably loop in some Android developers to find our about their plans. I've added them to the cc.
They know all about this and agreed that the code should be dropped for 2.6.33 if no one sends me patches. If someone does, then I will remove my 'delete the android code' patch in the staging tree.
Honestly, I'm not holding my breath :(
Heh, I'm glad, I did not make dream suppport dependend on CONFIG_ANDROID... :-).
Oops, no, it does depend on it.
Something like this?
Pavel
---
Make Dream support idenependend of CONFIG_ANDROID.
drivers/staging/Makefile renamed from drivers/staging.ofic/Makefile +1 -1
@@ -27,7 +27,7 @@ obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_ANDROID) += android/ -obj-$(CONFIG_ANDROID) += dream/ +obj-$(CONFIG_DREAM) += dream/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/
drivers/staging/dream/Kconfig renamed from drivers/staging.ofic/dream/Kconfig +3 -0
@@ -1,3 +1,6 @@ +config DREAM + tristate "HTC Dream support" + source "drivers/staging/dream/smd/Kconfig" source "drivers/staging/dream/camera/Kconfig"
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html