* linux-next: Tree for December 11
@ 2008-12-11 9:04 Stephen Rothwell
2008-12-11 12:40 ` Alexey Zaytsev
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2008-12-11 9:04 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 9382 bytes --]
Hi all,
Changes since 20081210:
New tree:
nommu
Undropped tree:
sound
Dropped trees (temporarily):
v4l-dvb (build problem)
mtd (difficult conflicts)
drm (build problem)
semaphore-removal (due to unfixed conflicts against Linus' tree)
cpu_alloc (build problem)
perfmon3 (concerns from the x86 team)
audit (difficult conflicts)
nommu (build problem)
staging (build failure)
The driver-core tree gained a build failure that needed a commit reverted.
The ftrace tree gained a conflict against Linus' tree.
The pci tree gained a conflict against the driver-core tree.
The mtd tree gained 3 conflicts against the arm tree which I could not
easily resolve, so it was dropped.
The ttydev tree gained a conflict against the async_tx tree requiring a
commit from the async_tx tree to be reverted.
The nommu tree gained conflicts against the slab and kmemcheck trees and
also a build failure so it was dropped.
----------------------------------------------------------------------------
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,
44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 132 trees (counting Linus' and 15 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 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-2.6.26
Merging audit-current/for-linus
Merging dwmw2/master
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
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/char/Makefile
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c
Created commit 1a20fa9: Revert "mtd: struct device - replace bus_id with dev_name(), dev_set_name()"
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
CONFLICT (content): Merge conflict in include/linux/ftrace.h
CONFLICT (content): Merge conflict in scripts/recordmcount.pl
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 pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pci-driver.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
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
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (delete/modify): arch/sparc64/kernel/idprom.c deleted in HEAD and modified in net/master. Version net/master of arch/sparc64/kernel/idprom.c left in tree.
CONFLICT (content): Merge conflict in fs/lockd/host.c
CONFLICT (content): Merge conflict in fs/lockd/mon.c
$ git rm -f arch/sparc64/kernel/idprom.c
Applying: net: async_tx merge fix
Merging mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c
$ git reset --hard
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging rr_cpumask/master
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in kernel/cpu.c
Merging cifs/master
CONFLICT (content): Merge conflict in fs/cifs/connect.c
Applying: cifs: update for new IP4/6 address printing
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
CONFLICT (content): Merge conflict in fs/ioctl.c
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/net/tg3.c
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
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 kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in drivers/char/tty_audit.c
CONFLICT (content): Merge conflict in fs/cifs/cifs_fs_sb.h
CONFLICT (content): Merge conflict in fs/ocfs2/namei.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/serial/8250.c
CONFLICT (content): Merge conflict in fs/devpts/inode.c
$ git reset --hard
Created commit a59876f: Revert "iop13xx: workaround errata that causes uart interrupts to be missed"
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
CONFLICT (content): Merge conflict in kernel/sched.c
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
CONFLICT (content): Merge conflict in Documentation/sysctl/vm.txt
CONFLICT (content): Merge conflict in kernel/fork.c
Merging trivial/for-next
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/winbond/linux/wbusb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/winbond/linux/wbusb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c
$ git rm -f drivers/staging/winbond/linux/wbusb.c
$ git reset --hard HEAD^
Merging scsi-post-merge/master
$ git reset --hard HEAD^^
Merging trivial/for-next
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: Tree for December 11
2008-12-11 9:04 linux-next: Tree for December 11 Stephen Rothwell
@ 2008-12-11 12:40 ` Alexey Zaytsev
2008-12-14 14:34 ` Alexey Zaytsev
0 siblings, 1 reply; 7+ messages in thread
From: Alexey Zaytsev @ 2008-12-11 12:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 3163 bytes --]
On Thu, Dec 11, 2008 at 12:04, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Changes since 20081210:
>
> New tree:
> nommu
>
> Undropped tree:
> sound
>
> Dropped trees (temporarily):
> v4l-dvb (build problem)
> mtd (difficult conflicts)
> drm (build problem)
> semaphore-removal (due to unfixed conflicts against Linus' tree)
> cpu_alloc (build problem)
> perfmon3 (concerns from the x86 team)
> audit (difficult conflicts)
> nommu (build problem)
> staging (build failure)
>
> The driver-core tree gained a build failure that needed a commit reverted.
>
> The ftrace tree gained a conflict against Linus' tree.
>
> The pci tree gained a conflict against the driver-core tree.
>
> The mtd tree gained 3 conflicts against the arm tree which I could not
> easily resolve, so it was dropped.
>
> The ttydev tree gained a conflict against the async_tx tree requiring a
> commit from the async_tx tree to be reverted.
>
> The nommu tree gained conflicts against the slab and kmemcheck trees and
> also a build failure so it was dropped.
>
> ----------------------------------------------------------------------------
Hi.
I'm seeing this warning early in boot logs. It does not appear on 2.6.28-rc7.
Not sure how long it's been around. Haven't built -next for some time.
[ 0.004000] Intel machine check reporting enabled on CPU#0.
[ 0.004000] using mwait in idle threads.
[ 0.004000] Checking 'hlt' instruction... <4>------------[ cut here
]------------
[ 0.004167] WARNING: at kernel/sched.c:4364 sub_preempt_count+0xae/0xc0()
[ 0.004266] Hardware name: HP Compaq nx7300 (GB848ES#ACB)
[ 0.004361] Modules linked in:
[ 0.004497] Pid: 0, comm: swapper Not tainted 2.6.28-rc8-next-20081211 #117
[ 0.004595] Call Trace:
[ 0.004689] [<c01324d6>] warn_slowpath+0x86/0xa0
[ 0.004789] [<c0155d00>] ? check_usage_forwards+0x10/0xb0
[ 0.004886] [<c015394a>] ? save_trace+0x3a/0xa0
[ 0.004981] [<c015742d>] ? mark_lock+0x37d/0xe00
[ 0.005076] [<c01580f9>] ? __lock_acquire+0x249/0x610
[ 0.005175] [<c04a3a02>] ? _spin_unlock_irq+0x22/0x50
[ 0.005272] [<c0158e50>] ? trace_hardirqs_on_caller+0x70/0x1a0
[ 0.005369] [<c04a3a0d>] ? _spin_unlock_irq+0x2d/0x50
[ 0.005465] [<c0124bfe>] sub_preempt_count+0xae/0xc0
[ 0.005564] [<c0137012>] _local_bh_enable+0x52/0xc0
[ 0.005661] [<c013725f>] __do_softirq+0x11f/0x170
[ 0.005756] [<c0137140>] ? __do_softirq+0x0/0x170
[ 0.005851] <IRQ> [<c0137729>] ? irq_exit+0x89/0xa0
[ 0.005993] [<c01059ed>] ? do_IRQ+0xad/0x120
[ 0.006088] [<c0103aac>] ? common_interrupt+0x2c/0x34
[ 0.006184] [<c013007b>] ? mmput+0x2b/0xc0
[ 0.006281] [<c06735a8>] ? check_bugs+0xb8/0xe0
[ 0.006379] [<c066b7ea>] ? start_kernel+0x26a/0x310
[ 0.006475] [<c066b270>] ? unknown_bootoption+0x0/0x210
[ 0.006572] [<c066b077>] ? __init_begin+0x77/0xb0
[ 0.006674] ---[ end trace 4eaa2a86a8e2da22 ]---
[ 0.016004] OK.
[ 0.016560] ACPI: Core revision 20081031
[ 0.044495] ..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1
Config and full dmesg attached.
[-- Attachment #2: config.gz --]
[-- Type: application/x-gzip, Size: 13973 bytes --]
[-- Attachment #3: dmesg.gz --]
[-- Type: application/x-gzip, Size: 15202 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: Tree for December 11
2008-12-11 12:40 ` Alexey Zaytsev
@ 2008-12-14 14:34 ` Alexey Zaytsev
2008-12-16 21:08 ` Ingo Molnar
0 siblings, 1 reply; 7+ messages in thread
From: Alexey Zaytsev @ 2008-12-14 14:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Ingo Molnar, Nick Piggin
On Thu, Dec 11, 2008 at 15:40, Alexey Zaytsev <alexey.zaytsev@gmail•com> wrote:
> On Thu, Dec 11, 2008 at 12:04, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>> Hi all,
>>
>> Changes since 20081210:
>>
>> New tree:
>> nommu
>>
>> Undropped tree:
>> sound
>>
>> Dropped trees (temporarily):
>> v4l-dvb (build problem)
>> mtd (difficult conflicts)
>> drm (build problem)
>> semaphore-removal (due to unfixed conflicts against Linus' tree)
>> cpu_alloc (build problem)
>> perfmon3 (concerns from the x86 team)
>> audit (difficult conflicts)
>> nommu (build problem)
>> staging (build failure)
>>
>> The driver-core tree gained a build failure that needed a commit reverted.
>>
>> The ftrace tree gained a conflict against Linus' tree.
>>
>> The pci tree gained a conflict against the driver-core tree.
>>
>> The mtd tree gained 3 conflicts against the arm tree which I could not
>> easily resolve, so it was dropped.
>>
>> The ttydev tree gained a conflict against the async_tx tree requiring a
>> commit from the async_tx tree to be reverted.
>>
>> The nommu tree gained conflicts against the slab and kmemcheck trees and
>> also a build failure so it was dropped.
>>
>> ----------------------------------------------------------------------------
>
> Hi.
>
> I'm seeing this warning early in boot logs. It does not appear on 2.6.28-rc7.
> Not sure how long it's been around. Haven't built -next for some time.
>
> [ 0.004000] Intel machine check reporting enabled on CPU#0.
> [ 0.004000] using mwait in idle threads.
> [ 0.004000] Checking 'hlt' instruction... <4>------------[ cut here
> ]------------
> [ 0.004167] WARNING: at kernel/sched.c:4364 sub_preempt_count+0xae/0xc0()
> [ 0.004266] Hardware name: HP Compaq nx7300 (GB848ES#ACB)
> [ 0.004361] Modules linked in:
> [ 0.004497] Pid: 0, comm: swapper Not tainted 2.6.28-rc8-next-20081211 #117
> [ 0.004595] Call Trace:
> [ 0.004689] [<c01324d6>] warn_slowpath+0x86/0xa0
> [ 0.004789] [<c0155d00>] ? check_usage_forwards+0x10/0xb0
> [ 0.004886] [<c015394a>] ? save_trace+0x3a/0xa0
> [ 0.004981] [<c015742d>] ? mark_lock+0x37d/0xe00
> [ 0.005076] [<c01580f9>] ? __lock_acquire+0x249/0x610
> [ 0.005175] [<c04a3a02>] ? _spin_unlock_irq+0x22/0x50
> [ 0.005272] [<c0158e50>] ? trace_hardirqs_on_caller+0x70/0x1a0
> [ 0.005369] [<c04a3a0d>] ? _spin_unlock_irq+0x2d/0x50
> [ 0.005465] [<c0124bfe>] sub_preempt_count+0xae/0xc0
> [ 0.005564] [<c0137012>] _local_bh_enable+0x52/0xc0
> [ 0.005661] [<c013725f>] __do_softirq+0x11f/0x170
> [ 0.005756] [<c0137140>] ? __do_softirq+0x0/0x170
> [ 0.005851] <IRQ> [<c0137729>] ? irq_exit+0x89/0xa0
> [ 0.005993] [<c01059ed>] ? do_IRQ+0xad/0x120
> [ 0.006088] [<c0103aac>] ? common_interrupt+0x2c/0x34
> [ 0.006184] [<c013007b>] ? mmput+0x2b/0xc0
> [ 0.006281] [<c06735a8>] ? check_bugs+0xb8/0xe0
> [ 0.006379] [<c066b7ea>] ? start_kernel+0x26a/0x310
> [ 0.006475] [<c066b270>] ? unknown_bootoption+0x0/0x210
> [ 0.006572] [<c066b077>] ? __init_begin+0x77/0xb0
> [ 0.006674] ---[ end trace 4eaa2a86a8e2da22 ]---
> [ 0.016004] OK.
> [ 0.016560] ACPI: Core revision 20081031
> [ 0.044495] ..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1
>
> Config and full dmesg attached.
>
The warning can also be reproduced in qemu, so it was easy to bisect.
commit 7317d7b87edb41a9135e30be1ec3f7ef817c53dd
Author: Nick Piggin <nickpiggin@yahoo•com.au>
Date: Tue Sep 30 20:50:27 2008 +1000
sched: improve preempt debugging
This patch helped me out with a problem I recently had....
Basically, when the kernel lock is held, then preempt_count
underflow does not
get detected until it is released which may be a long time (and arbitrarily,
eg at different points it may be rescheduled). If the bkl is released at
schedule, the resulting output is actually fairly cryptic...
With any other lock that elevates preempt_count, it is illegal to schedule
under it (which would get found pretty quickly). bkl allows scheduling with
preempt_count elevated, which makes underflows hard to debug.
Signed-off-by: Ingo Molnar <mingo@elte•hu>
I understand that not this particular commit is buggy, but at least
I've got someone to add to the CC. ;)
Also the author's e-mail looks suspicious.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: Tree for December 11
2008-12-14 14:34 ` Alexey Zaytsev
@ 2008-12-16 21:08 ` Ingo Molnar
2008-12-16 22:21 ` Alexey Zaytsev
0 siblings, 1 reply; 7+ messages in thread
From: Ingo Molnar @ 2008-12-16 21:08 UTC (permalink / raw)
To: Alexey Zaytsev; +Cc: Stephen Rothwell, linux-next, LKML, Nick Piggin
* Alexey Zaytsev <alexey.zaytsev@gmail•com> wrote:
> On Thu, Dec 11, 2008 at 15:40, Alexey Zaytsev <alexey.zaytsev@gmail•com> wrote:
> > On Thu, Dec 11, 2008 at 12:04, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >> Hi all,
> >>
> >> Changes since 20081210:
> >>
> >> New tree:
> >> nommu
> >>
> >> Undropped tree:
> >> sound
> >>
> >> Dropped trees (temporarily):
> >> v4l-dvb (build problem)
> >> mtd (difficult conflicts)
> >> drm (build problem)
> >> semaphore-removal (due to unfixed conflicts against Linus' tree)
> >> cpu_alloc (build problem)
> >> perfmon3 (concerns from the x86 team)
> >> audit (difficult conflicts)
> >> nommu (build problem)
> >> staging (build failure)
> >>
> >> The driver-core tree gained a build failure that needed a commit reverted.
> >>
> >> The ftrace tree gained a conflict against Linus' tree.
> >>
> >> The pci tree gained a conflict against the driver-core tree.
> >>
> >> The mtd tree gained 3 conflicts against the arm tree which I could not
> >> easily resolve, so it was dropped.
> >>
> >> The ttydev tree gained a conflict against the async_tx tree requiring a
> >> commit from the async_tx tree to be reverted.
> >>
> >> The nommu tree gained conflicts against the slab and kmemcheck trees and
> >> also a build failure so it was dropped.
> >>
> >> ----------------------------------------------------------------------------
> >
> > Hi.
> >
> > I'm seeing this warning early in boot logs. It does not appear on 2.6.28-rc7.
> > Not sure how long it's been around. Haven't built -next for some time.
> >
> > [ 0.004000] Intel machine check reporting enabled on CPU#0.
> > [ 0.004000] using mwait in idle threads.
> > [ 0.004000] Checking 'hlt' instruction... <4>------------[ cut here
> > ]------------
> > [ 0.004167] WARNING: at kernel/sched.c:4364 sub_preempt_count+0xae/0xc0()
> > [ 0.004266] Hardware name: HP Compaq nx7300 (GB848ES#ACB)
> > [ 0.004361] Modules linked in:
> > [ 0.004497] Pid: 0, comm: swapper Not tainted 2.6.28-rc8-next-20081211 #117
> > [ 0.004595] Call Trace:
> > [ 0.004689] [<c01324d6>] warn_slowpath+0x86/0xa0
> > [ 0.004789] [<c0155d00>] ? check_usage_forwards+0x10/0xb0
> > [ 0.004886] [<c015394a>] ? save_trace+0x3a/0xa0
> > [ 0.004981] [<c015742d>] ? mark_lock+0x37d/0xe00
> > [ 0.005076] [<c01580f9>] ? __lock_acquire+0x249/0x610
> > [ 0.005175] [<c04a3a02>] ? _spin_unlock_irq+0x22/0x50
> > [ 0.005272] [<c0158e50>] ? trace_hardirqs_on_caller+0x70/0x1a0
> > [ 0.005369] [<c04a3a0d>] ? _spin_unlock_irq+0x2d/0x50
> > [ 0.005465] [<c0124bfe>] sub_preempt_count+0xae/0xc0
> > [ 0.005564] [<c0137012>] _local_bh_enable+0x52/0xc0
> > [ 0.005661] [<c013725f>] __do_softirq+0x11f/0x170
> > [ 0.005756] [<c0137140>] ? __do_softirq+0x0/0x170
> > [ 0.005851] <IRQ> [<c0137729>] ? irq_exit+0x89/0xa0
> > [ 0.005993] [<c01059ed>] ? do_IRQ+0xad/0x120
> > [ 0.006088] [<c0103aac>] ? common_interrupt+0x2c/0x34
> > [ 0.006184] [<c013007b>] ? mmput+0x2b/0xc0
> > [ 0.006281] [<c06735a8>] ? check_bugs+0xb8/0xe0
> > [ 0.006379] [<c066b7ea>] ? start_kernel+0x26a/0x310
> > [ 0.006475] [<c066b270>] ? unknown_bootoption+0x0/0x210
> > [ 0.006572] [<c066b077>] ? __init_begin+0x77/0xb0
> > [ 0.006674] ---[ end trace 4eaa2a86a8e2da22 ]---
> > [ 0.016004] OK.
> > [ 0.016560] ACPI: Core revision 20081031
> > [ 0.044495] ..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1
> >
> > Config and full dmesg attached.
> >
>
> The warning can also be reproduced in qemu, so it was easy to bisect.
>
> commit 7317d7b87edb41a9135e30be1ec3f7ef817c53dd
> Author: Nick Piggin <nickpiggin@yahoo•com.au>
> Date: Tue Sep 30 20:50:27 2008 +1000
>
> sched: improve preempt debugging
>
> This patch helped me out with a problem I recently had....
>
> Basically, when the kernel lock is held, then preempt_count
> underflow does not
> get detected until it is released which may be a long time (and arbitrarily,
> eg at different points it may be rescheduled). If the bkl is released at
> schedule, the resulting output is actually fairly cryptic...
>
> With any other lock that elevates preempt_count, it is illegal to schedule
> under it (which would get found pretty quickly). bkl allows scheduling with
> preempt_count elevated, which makes underflows hard to debug.
>
> Signed-off-by: Ingo Molnar <mingo@elte•hu>
>
> I understand that not this particular commit is buggy, but at least
> I've got someone to add to the CC. ;)
>
> Also the author's e-mail looks suspicious.
Suspicious in what way?
Ingo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: Tree for December 11
2008-12-16 21:08 ` Ingo Molnar
@ 2008-12-16 22:21 ` Alexey Zaytsev
2008-12-16 22:23 ` Ingo Molnar
0 siblings, 1 reply; 7+ messages in thread
From: Alexey Zaytsev @ 2008-12-16 22:21 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Stephen Rothwell, linux-next, LKML, Nick Piggin
On Wed, Dec 17, 2008 at 00:08, Ingo Molnar <mingo@elte•hu> wrote:
>>
>> The warning can also be reproduced in qemu, so it was easy to bisect.
>>
>> commit 7317d7b87edb41a9135e30be1ec3f7ef817c53dd
>> Author: Nick Piggin <nickpiggin@yahoo•com.au>
>> Date: Tue Sep 30 20:50:27 2008 +1000
>>
>> sched: improve preempt debugging
>>
>> This patch helped me out with a problem I recently had....
>>
>> Basically, when the kernel lock is held, then preempt_count
>> underflow does not
>> get detected until it is released which may be a long time (and arbitrarily,
>> eg at different points it may be rescheduled). If the bkl is released at
>> schedule, the resulting output is actually fairly cryptic...
>>
>> With any other lock that elevates preempt_count, it is illegal to schedule
>> under it (which would get found pretty quickly). bkl allows scheduling with
>> preempt_count elevated, which makes underflows hard to debug.
>>
>> Signed-off-by: Ingo Molnar <mingo@elte•hu>
>>
>> I understand that not this particular commit is buggy, but at least
>> I've got someone to add to the CC. ;)
>>
>> Also the author's e-mail looks suspicious.
>
> Suspicious in what way?
Does not appear in signed-off-by.
>
> Ingo
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: Tree for December 11
2008-12-16 22:21 ` Alexey Zaytsev
@ 2008-12-16 22:23 ` Ingo Molnar
0 siblings, 0 replies; 7+ messages in thread
From: Ingo Molnar @ 2008-12-16 22:23 UTC (permalink / raw)
To: Alexey Zaytsev; +Cc: Stephen Rothwell, linux-next, LKML, Nick Piggin
* Alexey Zaytsev <alexey.zaytsev@gmail•com> wrote:
> On Wed, Dec 17, 2008 at 00:08, Ingo Molnar <mingo@elte•hu> wrote:
>
> >>
> >> The warning can also be reproduced in qemu, so it was easy to bisect.
> >>
> >> commit 7317d7b87edb41a9135e30be1ec3f7ef817c53dd
> >> Author: Nick Piggin <nickpiggin@yahoo•com.au>
> >> Date: Tue Sep 30 20:50:27 2008 +1000
> >>
> >> sched: improve preempt debugging
> >>
> >> This patch helped me out with a problem I recently had....
> >>
> >> Basically, when the kernel lock is held, then preempt_count
> >> underflow does not
> >> get detected until it is released which may be a long time (and arbitrarily,
> >> eg at different points it may be rescheduled). If the bkl is released at
> >> schedule, the resulting output is actually fairly cryptic...
> >>
> >> With any other lock that elevates preempt_count, it is illegal to schedule
> >> under it (which would get found pretty quickly). bkl allows scheduling with
> >> preempt_count elevated, which makes underflows hard to debug.
> >>
> >> Signed-off-by: Ingo Molnar <mingo@elte•hu>
> >>
> >> I understand that not this particular commit is buggy, but at least
> >> I've got someone to add to the CC. ;)
> >>
> >> Also the author's e-mail looks suspicious.
> >
> > Suspicious in what way?
>
> Does not appear in signed-off-by.
yes, because i applied and tested it through before Nick was comfortable
with signing off on it.
Ingo
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: Tree for December 11
@ 2009-12-11 5:01 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2009-12-11 5:01 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10746 bytes --]
Hi all,
My usual call for calm: please do not put stuff destined for 2.6.34 into
linux-next trees until after 2.6.33-rc1.
Changes since 20091210:
Since Linus is now merging trees into his, various conflicts move from
tree to tree.
The origin tree lost its build failure.
The microblaze tree lost its conflict.
The ext4 tree lost its build failure.
The rr tree lost its conflict, but gained a build failure for which I
applied a patch.
The trivial tree lost its conflicts.
The usb tree still has its build failure for which I reverted a commit.
----------------------------------------------------------------------------
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 155 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
CONFLICT (content): Merge conflict in include/net/tcp.h
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/for-linus
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 msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging avr32/avr32-arch
CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
CONFLICT (content): Merge conflict in arch/m68k/include/asm/ptrace.h
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/mips/Makefile
CONFLICT (content): Merge conflict in arch/mips/include/asm/ftrace.h
CONFLICT (add/add): Merge conflict in arch/mips/kernel/ftrace.c
CONFLICT (add/add): Merge conflict in arch/mips/kernel/mcount.S
CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile
CONFLICT (content): Merge conflict in scripts/recordmcount.pl
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
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 logfs/master
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
CONFLICT (add/add): Merge conflict in fs/9p/cache.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/x86/kernel/amd_iommu_init.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Applying: net: fix for utsrelease.h moving to generated
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging ieee1394/for-next
CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-1394.c
CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-fw.c
CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv.h
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c
CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c
CONFLICT (delete/modify): drivers/mtd/nand/excite_nandflash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/nand/excite_nandflash.c left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/nand/pxa3xx_nand.c
CONFLICT (content): Merge conflict in kernel/printk.c
$ git rm -f drivers/mtd/nand/excite_nandflash.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
CONFLICT (content): Merge conflict in include/acpi/processor.h
Merging quilt/rr
Applying: modpost: autoconf.h has moved to include/generated
Applying: rr: cpufreq: fix up for api name change
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
CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c
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
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 (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 fs/afs/write.c
CONFLICT (content): Merge conflict in fs/cifs/dir.c
CONFLICT (content): Merge conflict in fs/ubifs/file.c
CONFLICT (content): Merge conflict in include/asm-generic/fcntl.h
CONFLICT (content): Merge conflict in net/compat.c
CONFLICT (content): Merge conflict in net/socket.c
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
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 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
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/io.c
Merging tip/auto-latest
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (content): Merge conflict in mm/slab.c
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
CONFLICT (content): Merge conflict in MAINTAINERS
Merging sysctl/master
Merging quilt/driver-core
Merging quilt/tty
CONFLICT (content): Merge conflict in drivers/mmc/card/sdio_uart.c
Merging quilt/usb
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Makefile
[master c9ebc12] Revert "USB: prepare for changover to Runtime PM framework"
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc_cs.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_mio_cs.c
CONFLICT (content): Merge conflict in drivers/staging/vt6655/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/vt6656/Kconfig
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-12-11 5:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-11 9:04 linux-next: Tree for December 11 Stephen Rothwell
2008-12-11 12:40 ` Alexey Zaytsev
2008-12-14 14:34 ` Alexey Zaytsev
2008-12-16 21:08 ` Ingo Molnar
2008-12-16 22:21 ` Alexey Zaytsev
2008-12-16 22:23 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2009-12-11 5:01 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox