Hi all,
Changes since 20090327:
Various conflicts have moved around due to some trees being merged into
Linus' tree.
Linus' tree gained a build failure for which I applied a patch.
The arm tree lost its three conflicts.
The tracing tree inherited a build failure from the net tree.
The genirq tree lost its conflict.
The sched tree lost its conflict.
The v4l-dvb tree lost its build failure.
The acpi tree gained a conflict against Linus' tree but lost its build
failure.
The ext4 tree lost its conflict.
The net tree lost all its conflicts.
The rr tree lost 8 conflicts.
The slab tree lost all its conflicts.
The drm tree lost its conflict.
The lblnet tree lost its conflicts.
The proc tree gained a build failure due to a new commit in Linus' tree -
I applied a patch.
The suspend tree lost its 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 133 trees (counting Linus' and 18 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 [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master
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/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
Applying: x86: fix mismerge in arch/x86/include/asm/timer.h
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in arch/x86/kernel/pci-nommu.c
CONFLICT (content): Merge conflict in include/linux/netfilter/xt_limit.h
CONFLICT (content): Merge conflict in include/linux/netfilter/xt_statistic.h
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_cacheinfo.c
Merging tracing/auto-tracing-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in kernel/extable.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
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
Applying: net: tracing interface fixup
Merging pci/linux-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
Merging quota/for_next
CONFLICT (content): merge conflict in fs/quota/dquot.c
CONFLICT (content): Merge conflict in fs/Kconfig
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/longhaul.c
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/Makefile
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h
CONFLICT (content): Merge conflict in arch/x86/lguest/boot.c
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-default/setup.c left in tree.
CONFLICT (delete/modify): arch/x86/mach-voyager/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-voyager/setup.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in kernel/extable.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in kernel/sched_rt.c
$ git rm -f arch/x86/mach-default/setup.c
$ git rm -f arch/x86/mach-voyager/setup.c
Applying: rr: x86 irqaction merge fixup
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
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 quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging generic-ipi/auto-generic-ipi-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Applying: proc: update proc_net.c for simple_set_mnt API change
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Merging suspend/linux-next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c
CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in lib/Makefile
Merging quilt/usb
CONFLICT (rename/delete): Rename drivers/usb/misc/phidget.h->arch/arm/mach-gemini/include/mach/vmalloc.h in HEAD and deleted in quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Applying: tracing: fixup for ftrace_push_return_trace API change
linux-next 20090330 causes the following page fault on an edb9302
(ARM) like board:
# Unable to handle kernel paging request at virtual address 00535447
pgd = c56b0000
[00535447] *pgd=00000000
Internal error: Oops: 3 [#1] PREEMPT
Modules linked in:
CPU: 0 Not tainted (2.6.29-next-20090330 #6)
PC is at kmemleak_scan+0x158/0x3ac
LR is at find_and_get_object+0xe0/0x104
pc : [<c00aa5cc>] lr : [<c00a99d8>] psr: 00000013
sp : c55bff78 ip : c55bff28 fp : c55bffa4
r10: c0322718 r9 : c035fa6c r8 : c035f048
r7 : c035f044 r6 : 00005800 r5 : 00004981 r4 : 00093020
r3 : 00535443 r2 : 414f4c5f r1 : 00000001 r0 : c0400020
Flags: nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
Control: 0000717f Table: 0567c000 DAC: 00000017
Process kmemleak (pid: 343, stack limit = 0xc55be268)
Stack: (0xc55bff78 to 0xc55c0000)
ff60: c55bff94
00000000
ff80: 00000000 c55be000 0000ea60 c035fa78 c035fa6c c0322718 c55bffd4
c55bffa8
ffa0: c00aac10 c00aa484 c55bffd4 c55be000 00000000 c00aabbc 00000000
00000000
ffc0: 00000000 00000000 c55bfff4 c55bffd8 c005b80c c00aabcc 00000000
00000000
ffe0: 00000000 00000000 00000000 c55bfff8 c0048240 c005b7b0 ffffffff
ffffffff
[<c00aa5cc>] (kmemleak_scan+0x158/0x3ac) from [<c00aac10>]
(kmemleak_scan_thread+0x54/0x1bc)
[<c00aac10>] (kmemleak_scan_thread+0x54/0x1bc) from [<c005b80c>]
(kthread+0x6c/0xa0)
[<c005b80c>] (kthread+0x6c/0xa0) from [<c0048240>] (do_exit+0x0/0x764)
Code: e0830004 e3120801 1590300c 01a03000 (e5933004)
---[ end trace 356a238970dcd5a8 ]---
the fault is reproducible and happens some seconds after having
finished the boot process. please tell me if you need more information
(like the .config, ...) in order to track this down
best regards
--
Matthias Kaehlcke
Embedded Linux Engineer
Barcelona
The yellow ships hung in the air just like bricks dont do
(The Hitch-Hiker's Guide to the Galaxy)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-
On Mon, 2009-03-30 at 14:24 +0200, Matthias Kaehlcke wrote:
> linux-next 20090330 causes the following page fault on an edb9302
> (ARM) like board:
>
> # Unable to handle kernel paging request at virtual address 00535447
> pgd = c56b0000
> [00535447] *pgd=00000000
> Internal error: Oops: 3 [#1] PREEMPT
> Modules linked in:
> CPU: 0 Not tainted (2.6.29-next-20090330 #6)
> PC is at kmemleak_scan+0x158/0x3ac
> LR is at find_and_get_object+0xe0/0x104
> pc : [<c00aa5cc>] lr : [<c00a99d8>] psr: 00000013
> sp : c55bff78 ip : c55bff28 fp : c55bffa4
> r10: c0322718 r9 : c035fa6c r8 : c035f048
> r7 : c035f044 r6 : 00005800 r5 : 00004981 r4 : 00093020
> r3 : 00535443 r2 : 414f4c5f r1 : 00000001 r0 : c0400020
> Flags: nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
> Control: 0000717f Table: 0567c000 DAC: 00000017
> Process kmemleak (pid: 343, stack limit = 0xc55be268)
[...]
> the fault is reproducible and happens some seconds after having
> finished the boot process. please tell me if you need more information
> (like the .config, ...) in order to track this down
Yes, the .config would be useful. I'm mainly interested in which slab
allocator you are using. I'm testing kmemleak mainly on ARM and haven't
seen any issues.
Thanks.
--
Catalin
El Wed, Apr 01, 2009 at 10:30:08AM +0100 Catalin Marinas ha dit:
> On Mon, 2009-03-30 at 14:24 +0200, Matthias Kaehlcke wrote:
> > linux-next 20090330 causes the following page fault on an edb9302
> > (ARM) like board:
> >
> > # Unable to handle kernel paging request at virtual address 00535447
> > pgd = c56b0000
> > [00535447] *pgd=00000000
> > Internal error: Oops: 3 [#1] PREEMPT
> > Modules linked in:
> > CPU: 0 Not tainted (2.6.29-next-20090330 #6)
> > PC is at kmemleak_scan+0x158/0x3ac
> > LR is at find_and_get_object+0xe0/0x104
> > pc : [<c00aa5cc>] lr : [<c00a99d8>] psr: 00000013
> > sp : c55bff78 ip : c55bff28 fp : c55bffa4
> > r10: c0322718 r9 : c035fa6c r8 : c035f048
> > r7 : c035f044 r6 : 00005800 r5 : 00004981 r4 : 00093020
> > r3 : 00535443 r2 : 414f4c5f r1 : 00000001 r0 : c0400020
> > Flags: nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel
> > Control: 0000717f Table: 0567c000 DAC: 00000017
> > Process kmemleak (pid: 343, stack limit = 0xc55be268)
> [...]
> > the fault is reproducible and happens some seconds after having
> > finished the boot process. please tell me if you need more information
> > (like the .config, ...) in order to track this down
>
> Yes, the .config would be useful. I'm mainly interested in which slab
> allocator you are using. I'm testing kmemleak mainly on ARM and haven't
> seen any issues.
attached is the .config for linux-next 20090401, which should be
roughly the same than the 20090330 one.
some hours ago i booted the board with 20090401 and the page fault
didn't happen
--
Matthias Kaehlcke
Embedded Linux Engineer
Barcelona
La libertad es como la ma?ana. Hay quienes esperan dormidos a que
llegue, pero hay quienes desvelan y caminan la noche para alcanzarla
(Subcomandante Marcos)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-
On Wed, 2009-04-01 at 11:52 +0200, Matthias Kaehlcke wrote:
> El Wed, Apr 01, 2009 at 10:30:08AM +0100 Catalin Marinas ha dit:
>
> > On Mon, 2009-03-30 at 14:24 +0200, Matthias Kaehlcke wrote:
> > > linux-next 20090330 causes the following page fault on an edb9302
> > > (ARM) like board:
> > [...]
> > > the fault is reproducible and happens some seconds after having
> > > finished the boot process. please tell me if you need more information
> > > (like the .config, ...) in order to track this down
> >
> > Yes, the .config would be useful. I'm mainly interested in which slab
> > allocator you are using. I'm testing kmemleak mainly on ARM and haven't
> > seen any issues.
>
> attached is the .config for linux-next 20090401, which should be
> roughly the same than the 20090330 one.
>
> some hours ago i booted the board with 20090401 and the page fault
> didn't happen
Do you still get this fault with the latest linux-next? I can't
reproduce it on my ARM platform (I tried it with the latest mainline
kernel as well).
--
Catalin
El Thu, Apr 02, 2009 at 05:08:35PM +0100 Catalin Marinas ha dit:
> On Wed, 2009-04-01 at 11:52 +0200, Matthias Kaehlcke wrote:
> > El Wed, Apr 01, 2009 at 10:30:08AM +0100 Catalin Marinas ha dit:
> >
> > > On Mon, 2009-03-30 at 14:24 +0200, Matthias Kaehlcke wrote:
> > > > linux-next 20090330 causes the following page fault on an edb9302
> > > > (ARM) like board:
> > > [...]
> > > > the fault is reproducible and happens some seconds after having
> > > > finished the boot process. please tell me if you need more information
> > > > (like the .config, ...) in order to track this down
> > >
> > > Yes, the .config would be useful. I'm mainly interested in which slab
> > > allocator you are using. I'm testing kmemleak mainly on ARM and haven't
> > > seen any issues.
> >
> > attached is the .config for linux-next 20090401, which should be
> > roughly the same than the 20090330 one.
> >
> > some hours ago i booted the board with 20090401 and the page fault
> > didn't happen
>
> Do you still get this fault with the latest linux-next? I can't
> reproduce it on my ARM platform (I tried it with the latest mainline
> kernel as well).
still haven't tried with 20090402, but with 20090401 i didn't get the
fault
--
Matthias Kaehlcke
Embedded Linux Engineer
Barcelona
Control over the use of one's ideas really constitutes control over other
people's lives; and it is usually used to make their lives more difficult.
(Richard Stallman)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-