* linux-next: Tree for August 6
@ 2009-08-06 9:22 Stephen Rothwell
2009-08-06 20:50 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2009-08-06 9:22 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8479 bytes --]
Hi all,
Changes since 20090805:
The next-yyyymmdd tags will now be signed tags by request.
This tree fails to build for powerpc allyesconfig (final link problem).
The agp tree gained a build failure for which I reverted a commit.
The edac-amd tree lost its conflicts but gained another conflict against
the rr tree.
The tty tree lost a conflict.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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) 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 138 trees (counting Linus' and 20 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ 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 cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging thumb-2/thumb-2
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
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/next
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
CONFLICT (content): Merge conflict in fs/configfs/dir.c
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 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
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/lguest/boot.c
CONFLICT (content): Merge conflict in drivers/lguest/page_tables.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci.c
[master c69a397] Revert "cpumask:remove-set_cpus_allowed"
Merging mmc/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
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
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
CONFLICT (content): Merge conflict in MAINTAINERS
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
Applying: drbd: fix for removal of blk_queue_stack_limits
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c
CONFLICT (content): Merge conflict in drivers/usb/host/r8a66597-hcd.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master
[master 0e15677] Revert "agp: kill phys_to_gart() and gart_to_phys()"
[master c95724f] Revert "agp: Switch agp_{un,}map_page() to take struct page * argument"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: Tree for August 6
2009-08-06 9:22 linux-next: Tree for August 6 Stephen Rothwell
@ 2009-08-06 20:50 ` Bartlomiej Zolnierkiewicz
2009-08-07 13:15 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 8+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2009-08-06 20:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
On Thursday 06 August 2009 11:22:09 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090805:
At the moment -next is completely unusable for anything other than
detecting merge conflicts.. Running -next was never a completely
smooth experience but for a past year it was more-or-less doable.
However the last two months have been an absolute horror and I've
been hitting issues way faster than I was able to trace/report
them properly..
Right now I still have following *outstanding* issues (on just *one*
machine/distribution):
- Random (after some long hours) order:6 mode:0x8020 page allocation
failure (when ipw2200 driver reloads firmware on firmware error).
[ I had first thought that it was caused by SLQB (which got enabled
as default somewhere along the way) but it also happens with SLUB
and I have good reasons to believe that is caused by heavy mm
changes first seen in next-20090618 (I've been testing next-20090617
for many days and it never happened there), the last confirmed
release with the problem is next-20090728. ]
- bdi warning, http://lkml.org/lkml/2009/7/15/262, (this one goes back
to at least next-20090708, reconfirmed with next-20090806).
- Random OOPSes on shutdown (since the last week or so, didn't have time
to investigate them).
- Lockup on stopping iptables (I've just noticed it in next-20090806,
seems to also happen with next-20090731).
I give up and I'm back to using Linus' tree.. :(
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: Tree for August 6
2009-08-06 20:50 ` Bartlomiej Zolnierkiewicz
@ 2009-08-07 13:15 ` Bartlomiej Zolnierkiewicz
2009-08-15 16:56 ` mm/ipw2200 regression (was: Re: linux-next: Tree for August 6) Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 8+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2009-08-07 13:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
On Thursday 06 August 2009 22:50:50 Bartlomiej Zolnierkiewicz wrote:
> On Thursday 06 August 2009 11:22:09 Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20090805:
>
> At the moment -next is completely unusable for anything other than
> detecting merge conflicts.. Running -next was never a completely
> smooth experience but for a past year it was more-or-less doable.
> However the last two months have been an absolute horror and I've
> been hitting issues way faster than I was able to trace/report
> them properly..
>
> Right now I still have following *outstanding* issues (on just *one*
> machine/distribution):
>
> - Random (after some long hours) order:6 mode:0x8020 page allocation
> failure (when ipw2200 driver reloads firmware on firmware error).
>
> [ I had first thought that it was caused by SLQB (which got enabled
> as default somewhere along the way) but it also happens with SLUB
> and I have good reasons to believe that is caused by heavy mm
> changes first seen in next-20090618 (I've been testing next-20090617
> for many days and it never happened there), the last confirmed
> release with the problem is next-20090728. ]
If anyone is interested in the full log of the problem:
ipw2200: Firmware error detected. Restarting.
ipw2200/0: page allocation failure. order:6, mode:0x8020
Pid: 1004, comm: ipw2200/0 Not tainted 2.6.31-rc4-next-20090728-04869-gdae50fe-dirty #51
Call Trace:
[<c0396a2c>] ? printk+0xf/0x13
[<c0169ec1>] __alloc_pages_nodemask+0x3dd/0x41f
[<c0106907>] dma_generic_alloc_coherent+0x53/0xb8
[<c01068b4>] ? dma_generic_alloc_coherent+0x0/0xb8
[<e159d12f>] ipw_load_firmware+0x8c/0x4f8 [ipw2200]
[<c01029fc>] ? restore_all_notrace+0x0/0x18
[<e1599e4d>] ? ipw_stop_nic+0x2b/0x5d [ipw2200]
[<e15a194e>] ipw_load+0x8b2/0xf94 [ipw2200]
[<c0399680>] ? _spin_unlock_irqrestore+0x36/0x51
[<e15a57be>] ipw_up+0xe1/0x5c6 [ipw2200]
[<e15a3834>] ? ipw_down+0x1f7/0x1ff [ipw2200]
[<e15a5cd5>] ipw_adapter_restart+0x32/0x46 [ipw2200]
[<e15a5d0a>] ipw_bg_adapter_restart+0x21/0x2c [ipw2200]
[<c0139aac>] worker_thread+0x15e/0x240
[<c0139a6a>] ? worker_thread+0x11c/0x240
[<e15a5ce9>] ? ipw_bg_adapter_restart+0x0/0x2c [ipw2200]
[<c013ce99>] ? autoremove_wake_function+0x0/0x2f
[<c013994e>] ? worker_thread+0x0/0x240
[<c013cc5f>] kthread+0x66/0x6b
[<c013cbf9>] ? kthread+0x0/0x6b
[<c01034eb>] kernel_thread_helper+0x7/0x10
Mem-Info:
DMA per-cpu:
CPU 0: hi: 0, btch: 1 usd: 0
Normal per-cpu:
CPU 0: hi: 186, btch: 31 usd: 178
Active_anon:22467 active_file:10815 inactive_anon:22483
inactive_file:28605 unevictable:2 dirty:626 writeback:190 unstable:0
free:28497 slab:4190 mapped:5638 pagetables:895 bounce:0
DMA free:2084kB min:84kB low:104kB high:124kB active_anon:732kB inactive_anon:996kB active_file:652kB inactive_file:1980kB unevictable:0kB present:15868kB pages_scanned:0 all_unreclaimable? no
lowmem_reserve[]: 0 492 492
Normal free:111904kB min:2792kB low:3488kB high:4188kB active_anon:89136kB inactive_anon:88936kB active_file:42608kB inactive_file:112440kB unevictable:8kB present:503872kB pages_scanned:53 all_unreclaimable? no
lowmem_reserve[]: 0 0 0
DMA: 9*4kB 4*8kB 6*16kB 2*32kB 1*64kB 0*128kB 1*256kB 1*512kB 1*1024kB 0*2048kB 0*4096kB = 2084kB
Normal: 12926*4kB 2437*8kB 1294*16kB 479*32kB 63*64kB 5*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 111904kB
40160 total pagecache pages
0 pages in swap cache
Swap cache stats: add 0, delete 0, find 0/0
Free swap = 0kB
Total swap = 0kB
131056 pages RAM
3587 pages reserved
50606 pages shared
66006 pages non-shared
ipw2200: Unable to load firmware: -12
ipw2200: Unable to load firmware: -12
ipw2200: Failed to up device
^ permalink raw reply [flat|nested] 8+ messages in thread
* mm/ipw2200 regression (was: Re: linux-next: Tree for August 6)
2009-08-07 13:15 ` Bartlomiej Zolnierkiewicz
@ 2009-08-15 16:56 ` Bartlomiej Zolnierkiewicz
2009-08-16 7:31 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2009-08-15 16:56 UTC (permalink / raw)
To: linux-mm; +Cc: Stephen Rothwell, linux-next, LKML, Rafael J. Wysocki
On Friday 07 August 2009 15:15:45 Bartlomiej Zolnierkiewicz wrote:
> On Thursday 06 August 2009 22:50:50 Bartlomiej Zolnierkiewicz wrote:
> > On Thursday 06 August 2009 11:22:09 Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Changes since 20090805:
> >
> > At the moment -next is completely unusable for anything other than
> > detecting merge conflicts.. Running -next was never a completely
> > smooth experience but for a past year it was more-or-less doable.
> > However the last two months have been an absolute horror and I've
> > been hitting issues way faster than I was able to trace/report
> > them properly..
> >
> > Right now I still have following *outstanding* issues (on just *one*
> > machine/distribution):
> >
> > - Random (after some long hours) order:6 mode:0x8020 page allocation
> > failure (when ipw2200 driver reloads firmware on firmware error).
> >
> > [ I had first thought that it was caused by SLQB (which got enabled
> > as default somewhere along the way) but it also happens with SLUB
> > and I have good reasons to believe that is caused by heavy mm
> > changes first seen in next-20090618 (I've been testing next-20090617
> > for many days and it never happened there), the last confirmed
> > release with the problem is next-20090728. ]
>
> If anyone is interested in the full log of the problem:
>
> ipw2200: Firmware error detected. Restarting.
> ipw2200/0: page allocation failure. order:6, mode:0x8020
> Pid: 1004, comm: ipw2200/0 Not tainted 2.6.31-rc4-next-20090728-04869-gdae50fe-dirty #51
The bug managed to slip into Linus' tree..
ipw2200: Firmware error detected. Restarting.
ipw2200/0: page allocation failure. order:6, mode:0x8020
Pid: 945, comm: ipw2200/0 Not tainted 2.6.31-rc6-dirty #69
Call Trace:
[<c039505f>] ? printk+0xf/0x18
[<c016abc7>] __alloc_pages_nodemask+0x400/0x442
[<c01068b5>] dma_generic_alloc_coherent+0x53/0xc2
[<c0106862>] ? dma_generic_alloc_coherent+0x0/0xc2
[<e12c409b>] ipw_load_firmware+0x8f/0x4fb [ipw2200]
[<c01029bc>] ? restore_all_notrace+0x0/0x18
[<e12c0def>] ? ipw_stop_nic+0x2b/0x5d [ipw2200]
[<e12c88bd>] ipw_load+0x8b2/0xf94 [ipw2200]
[<e12cc727>] ipw_up+0xe1/0x5c6 [ipw2200]
[<e12ca7a3>] ? ipw_down+0x1f7/0x1ff [ipw2200]
[<e12ccc3e>] ipw_adapter_restart+0x32/0x46 [ipw2200]
[<e12ccc73>] ipw_bg_adapter_restart+0x21/0x2c [ipw2200]
[<c0139694>] worker_thread+0x15e/0x240
[<c0139652>] ? worker_thread+0x11c/0x240
[<e12ccc52>] ? ipw_bg_adapter_restart+0x0/0x2c [ipw2200]
[<c013ca65>] ? autoremove_wake_function+0x0/0x2f
[<c0139536>] ? worker_thread+0x0/0x240
[<c013c828>] kthread+0x6b/0x70
[<c013c7bd>] ? kthread+0x0/0x70
[<c01034ab>] kernel_thread_helper+0x7/0x10
Mem-Info:
DMA per-cpu:
CPU 0: hi: 0, btch: 1 usd: 0
Normal per-cpu:
CPU 0: hi: 186, btch: 31 usd: 80
Active_anon:25319 active_file:23485 inactive_anon:25576
inactive_file:23530 unevictable:2 dirty:1464 writeback:200 unstable:0
free:11175 slab:6927 mapped:7760 pagetables:930 bounce:0
DMA free:2052kB min:84kB low:104kB high:124kB active_anon:0kB inactive_anon:92kB active_file:1608kB inactive_file:1604kB unevictable:0kB present:15788kB pages_scanned:0 all_unreclaimable? no
lowmem_reserve[]: 0 489 489
Normal free:42648kB min:2788kB low:3484kB high:4180kB active_anon:101276kB inactive_anon:102212kB active_file:92332kB inactive_file:92516kB unevictable:8kB present:501392kB pages_scanned:0 all_unreclaimable? no
lowmem_reserve[]: 0 0 0
DMA: 3*4kB 7*8kB 2*16kB 1*32kB 0*64kB 1*128kB 1*256kB 1*512kB 1*1024kB 0*2048kB 0*4096kB = 2052kB
Normal: 1038*4kB 2148*8kB 1200*16kB 56*32kB 1*64kB 0*128kB 1*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 42648kB
52333 total pagecache pages
4675 pages in swap cache
Swap cache stats: add 27030, delete 22355, find 3967/5275
Free swap = 956380kB
Total swap = 1020116kB
131056 pages RAM
4225 pages reserved
53608 pages shared
86334 pages non-shared
ipw2200: Unable to load firmware: -12
ipw2200: Unable to load firmware: -12
ipw2200: Failed to up device
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: mm/ipw2200 regression (was: Re: linux-next: Tree for August 6)
2009-08-15 16:56 ` mm/ipw2200 regression (was: Re: linux-next: Tree for August 6) Bartlomiej Zolnierkiewicz
@ 2009-08-16 7:31 ` Stephen Rothwell
2009-08-16 10:17 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2009-08-16 7:31 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-mm, linux-next, LKML, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Bart,
On Sat, 15 Aug 2009 18:56:48 +0200 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
>
> The bug managed to slip into Linus' tree..
>
> ipw2200: Firmware error detected. Restarting.
> ipw2200/0: page allocation failure. order:6, mode:0x8020
> Pid: 945, comm: ipw2200/0 Not tainted 2.6.31-rc6-dirty #69
^^^^^
So, this is rc6 plus what? (just in case it is relevant).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: mm/ipw2200 regression (was: Re: linux-next: Tree for August 6)
2009-08-16 7:31 ` Stephen Rothwell
@ 2009-08-16 10:17 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 8+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2009-08-16 10:17 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-mm, linux-next, LKML, Rafael J. Wysocki, akpm
Hi,
On Sunday 16 August 2009 09:31:01 Stephen Rothwell wrote:
> Hi Bart,
>
> On Sat, 15 Aug 2009 18:56:48 +0200 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
> >
> > The bug managed to slip into Linus' tree..
> >
> > ipw2200: Firmware error detected. Restarting.
> > ipw2200/0: page allocation failure. order:6, mode:0x8020
> > Pid: 945, comm: ipw2200/0 Not tainted 2.6.31-rc6-dirty #69
> ^^^^^
> So, this is rc6 plus what? (just in case it is relevant).
In this case plus upcoming staging/rt{286,287,307}0 patches (irrelevant,
they are not used on this machine and the problem happened many times
with vanilla -next kernels in the past)..
After going through mm commits in Linus' tree I think that the bug came
the other way around, from akpm's tree to Linus' tree and then to -next
(page allocator changes seem to match "the suspect's profile")..
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: Tree for August 6
@ 2010-08-06 3:27 Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2010-08-06 3:27 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 12415 bytes --]
Hi all,
As the merge window is open, please do not add 2.6.37 material to your
linux-next included trees until after 2.6.36-rc1.
Changes since 20100805:
The davinci tree lost its conflict.
The cifs tree still has its build failure.
The hid tree lost its conflict.
The sound tree lost its conflict.
The block tree lost its build failure and a conflict.
The security-testing tree lost its conflicts.
The devicetree tree lost its conflict.
The xen tree lost its conflicts.
The usb tree lost its conflict.
----------------------------------------------------------------------------
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/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 169 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ 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 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 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
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (add/add): Merge conflict in arch/arm/plat-samsung/include/plat/keypad.h
Merging tegra/for-next
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
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
CONFLICT (content): Merge conflict in arch/mips/powertv/memory.c
CONFLICT (add/add): Merge conflict in arch/mips/sibyte/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/txx9/Makefile
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in drivers/net/irda/sh_irda.c
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Applying: ceph: update for removal of request flag wrappers
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_aops.c
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
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
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
Applying: v9fs: fixup for inode_setattr being removed
Applying: xfs: update tracing for clear_inode to evit_inode transition
Applying: cifs: fix for clear_inode -> evict_inode API change
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
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 swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Makefile
CONFLICT (content): Merge conflict in include/xen/xen-ops.h
Merging ibft/master
Merging scsi/master
Merging async_tx/next
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/devices-db8500.c
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/um/drivers/hostaudio_kern.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying: nfs: update for module_param_named API change
Applying: AppArmor: update for module_param_named API change
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
Merging quilt/device-mapper
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/Kconfig
CONFLICT (content): Merge conflict in drivers/power/Makefile
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
CONFLICT (content): Merge conflict in Documentation/DocBook/kgdb.tmpl
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 viafb/viafb-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 quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/io.h
CONFLICT (content): Merge conflict in arch/arm/kernel/entry-armv.S
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging alacrity/linux-next
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging limits/writable_limits
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
CONFLICT (content): Merge conflict in include/asm-generic/unistd.h
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging tip/auto-latest
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in Makefile
CONFLICT (content): Merge conflict in arch/powerpc/kernel/time.c
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging lost-spurious-irq/lost-spurious-irq
CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c
CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c
CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
CONFLICT (content): Merge conflict in fs/cifs/cifsglob.h
CONFLICT (content): Merge conflict in fs/cifs/file.c
CONFLICT (content): Merge conflict in include/linux/libata.h
CONFLICT (content): Merge conflict in include/linux/workqueue.h
CONFLICT (content): Merge conflict in kernel/trace/Kconfig
CONFLICT (content): Merge conflict in kernel/workqueue.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
CONFLICT (content): Merge conflict in mm/memory-failure.c
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
Merging quilt/tty
CONFLICT (content): Merge conflict in drivers/char/vt.c
CONFLICT (content): Merge conflict in include/linux/serial_core.h
Merging quilt/usb
Merging staging-next/staging-next
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/bat_sysfs.c
CONFLICT (delete/modify): drivers/staging/batman-adv/device.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/batman-adv/device.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/quatech_daqp_cs.c
CONFLICT (delete/modify): drivers/staging/cx25821/cx25821-audups11.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/cx25821/cx25821-audups11.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/wlags49_h2/wl_cs.c
$ git rm -f drivers/staging/cx25821/cx25821-audups11.c
$ git rm -f drivers/staging/batman-adv/device.c
Merging slabh/slabh
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
Applying: [SCSI] be2iscsi: Add support for iscsi boot
Applying: [SCSI] be2iscsi: Increase max sector
Applying: [SCSI] be2iscsi: Driver Version change to 2.0.549.0
Applying: [SCSI] be2iscsi: select ISCSI_BOOT_SYSFS
Applying: cifs: include linux/err.h for IS_ERR and PTR_ERR
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: Tree for August 6
@ 2008-08-06 8:28 Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2008-08-06 8:28 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 6359 bytes --]
Hi all,
Changes since next-20080805:
Changed tree: v4l-dvb (try a new tree to see).
The md-current and md trees were not fetched due to a fault on the server.
The v4l-dvb tree is back and merged fine.
The ide tree gained a trivial conflict against Linus' tree.
The crypto tree lost its build fix patch.
The mfd tree lost its build problem.
I again merged Linus' tree a second time at the end of the tree today -
this made the patches much smaller as -rc2 had been released.
I have also applied the following patches for known problems:
Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
Revert "Input: expand keycode space"
xen-balloon: fix up sysfs issues
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 107 trees (counting Linus' and 14 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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Applying usb: two more functions are needed when CONFIG_PM is not set
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging dwmw2/master
Merging quilt/driver-core
Applying driver-core: kobject verification fixup
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/genapic_64.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/master
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in drivers/ide/ide-dma.c
CONFLICT (content): Merge conflict in drivers/ide/ide-iops.c
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in include/linux/kvm.h
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
Merging ocfs2/linux-next
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging sparc/master
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging arm/devel
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
Merging bkl-removal/bkl-removal
Merging trivial/next
CONFLICT (content): Merge conflict in Documentation/edac.txt
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging m68knommu/for-next
Merging uclinux/for-next
Merging md/for-next
Merging cris/for-next
Merging kmemcheck/auto-kmemcheck-next
Merging generic-ipi/auto-generic-ipi-next
Merging mips/mips-for-linux-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging master_tmp
Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
Created commit f757622: Revert "Input: expand keycode space"
Applying xen-balloon: fix up sysfs issues
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-08-06 3:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-06 9:22 linux-next: Tree for August 6 Stephen Rothwell
2009-08-06 20:50 ` Bartlomiej Zolnierkiewicz
2009-08-07 13:15 ` Bartlomiej Zolnierkiewicz
2009-08-15 16:56 ` mm/ipw2200 regression (was: Re: linux-next: Tree for August 6) Bartlomiej Zolnierkiewicz
2009-08-16 7:31 ` Stephen Rothwell
2009-08-16 10:17 ` Bartlomiej Zolnierkiewicz
-- strict thread matches above, loose matches on Subject: below --
2010-08-06 3:27 linux-next: Tree for August 6 Stephen Rothwell
2008-08-06 8:28 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).