* linux-next: Tree for September 4
@ 2008-09-04 9:36 Stephen Rothwell
2008-09-04 11:52 ` Alan Cox
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-09-04 9:36 UTC (permalink / raw)
To: linux-next; +Cc: LKML, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 9623 bytes --]
Hi all,
Changes since next-20080903:
I have reverted the ttydev tree for today at Andrew's request since it is
causing him a problem.
The dwmw2 tree needed a commit reverted to fix the build.
The sparc tree gained a trivial conflict against Linus' tree.
The block tree lost 2 conflicts and a build fix patch.
I have also applied the following patches for known problems:
ftrace: protect the definition of ftrace_release
revert BUILD_BUG_ON change
Revert "debug: add notifier chain debugging"
debug: add notifier chain debugging (different version)
sparc: qlogicpti fallout from sbus removal
powerpc: make sure all kernel test is before _etext
----------------------------------------------------------------------------
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 113 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
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging dwmw2/master
Created commit 636b031: Revert "Blacklist DMAR on Intel G31/G33 chipsets"
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging quilt/m68k
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/powerpc-next
Merging 4xx/next
Merging galak/powerpc-next
Merging s390/features
Merging sh/master
Merging sparc/master
CONFLICT (content): Merge conflict in arch/sparc/kernel/of_device.c
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h
CONFLICT (content): Merge conflict in include/asm-x86/statfs.h
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
CONFLICT (content): Merge conflict in kernel/module.c
Applying ftrace: remove warning of old objcopy and local functions
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
CONFLICT (content): Merge conflict in include/asm-x86/pda.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-core.c
Applying HID: fix for warn() removal
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/stable
CONFLICT (content): Merge conflict in drivers/media/radio/dsbr100.c
CONFLICT (content): Merge conflict in drivers/media/video/zr364xx.c
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 drivers/misc/acer-wmi.c
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in include/asm-x86/kvm.h
Merging dlm/next
Merging scsi/master
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Applying rr: build fix for remove CONFIG_KMOD from net
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
CONFLICT (content): Merge conflict in drivers/ide/ide-disk.c
CONFLICT (content): Merge conflict in drivers/md/dm-mpath.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c
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/kernel/process_64.c
CONFLICT (content): Merge conflict in arch/x86/kernel/traps_64.c
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in 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 drm/drm-next
Merging voltage/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in drivers/char/tty_io.c
CONFLICT (content): Merge conflict in drivers/char/vt.c
CONFLICT (content): Merge conflict in drivers/usb/serial/aircable.c
CONFLICT (content): Merge conflict in drivers/usb/serial/keyspan_pda.c
CONFLICT (content): Merge conflict in drivers/usb/serial/safe_serial.c
CONFLICT (content): Merge conflict in kernel/auditsc.c
Merging agp/agp-next
Merging creds/next-creds
CONFLICT (content): Merge conflict in drivers/net/wan/sbni.c
CONFLICT (content): Merge conflict in fs/namespace.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_linux.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.c
CONFLICT (content): Merge conflict in include/linux/capability.h
CONFLICT (add/add): Merge conflict in include/linux/cred.h
CONFLICT (content): Merge conflict in include/linux/security.h
CONFLICT (content): Merge conflict in kernel/exit.c
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in security/commoncap.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
Merging oprofile/auto-oprofile-next
CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c
Merging fastboot/auto-fastboot-next
CONFLICT (content): Merge conflict in include/linux/init.h
Merging sparseirq/auto-sparseirq-next
CONFLICT (delete/modify): arch/x86/kernel/apic_64.c deleted in sparseirq/auto-sparseirq-next and modified in HEAD. Version HEAD of arch/x86/kernel/apic_64.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/xen/spinlock.c
CONFLICT (content): Merge conflict in drivers/serial/68328serial.c
CONFLICT (content): Merge conflict in drivers/serial/8250.c
$ git rm arch/x86/kernel/apic_64.c
CONFLICT (content): Merge conflict in kernel/fork.c
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.
Created commit 0f6dc77: Revert "Merge branch 'quilt/ttydev'"
Applying revert BUILD_BUG_ON change
Applying ftrace: protect the definition of ftrace_release
Created commit 201c2cd: Revert "debug: add notifier chain debugging"
Applying debug: add notifier chain debugging
Applying sparc: qlogicpti fallout from sbus removal
Applying powerpc: make sure all kernel test is before _etext
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-04 9:36 Stephen Rothwell
@ 2008-09-04 11:52 ` Alan Cox
2008-09-04 12:51 ` Stephen Rothwell
2008-09-04 23:53 ` Andrew Morton
2008-09-05 4:44 ` Andrew Morton
2 siblings, 1 reply; 15+ messages in thread
From: Alan Cox @ 2008-09-04 11:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Andrew Morton
> I have reverted the ttydev tree for today at Andrew's request since it is
> causing him a problem.
I've pushed a "mini" ttydev tree with just the fixes and earlier patches
in for the moment while I nail this one down. That way the stuff which
is independent can still be tested and get to Linus even if the big tty
rework has to be delayed.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-04 11:52 ` Alan Cox
@ 2008-09-04 12:51 ` Stephen Rothwell
0 siblings, 0 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-09-04 12:51 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-next, LKML, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
Hi Alan,
On Thu, 4 Sep 2008 12:52:48 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> > I have reverted the ttydev tree for today at Andrew's request since it is
> > causing him a problem.
>
> I've pushed a "mini" ttydev tree with just the fixes and earlier patches
> in for the moment while I nail this one down. That way the stuff which
> is independent can still be tested and get to Linus even if the big tty
> rework has to be delayed.
Thanks, I will fetch that tomorrow. (Aren't timezones fun? :-))
--
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] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-04 9:36 Stephen Rothwell
2008-09-04 11:52 ` Alan Cox
@ 2008-09-04 23:53 ` Andrew Morton
2008-09-05 0:07 ` David Woodhouse
2008-09-05 4:44 ` Andrew Morton
2 siblings, 1 reply; 15+ messages in thread
From: Andrew Morton @ 2008-09-04 23:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, David Woodhouse
On Thu, 4 Sep 2008 19:36:06 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
sparc64 `make headers_check':
make[1]: *** No rule to make target `/usr/src/devel/arch/sparc/include/asm/statfs_32.h', needed by `/usr/src/devel/usr/include/asm/.install'. Stop.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-04 23:53 ` Andrew Morton
@ 2008-09-05 0:07 ` David Woodhouse
0 siblings, 0 replies; 15+ messages in thread
From: David Woodhouse @ 2008-09-05 0:07 UTC (permalink / raw)
To: Andrew Morton; +Cc: Stephen Rothwell, linux-next, linux-kernel
On Thu, 2008-09-04 at 16:53 -0700, Andrew Morton wrote:
>
> sparc64 `make headers_check':
>
> make[1]: *** No rule to make target
> `/usr/src/devel/arch/sparc/include/asm/statfs_32.h', needed by
> `/usr/src/devel/usr/include/asm/.install'. Stop.
Fixed in ~dwmw2/random-2.6.git. Thanks.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-04 9:36 Stephen Rothwell
2008-09-04 11:52 ` Alan Cox
2008-09-04 23:53 ` Andrew Morton
@ 2008-09-05 4:44 ` Andrew Morton
2008-09-05 10:56 ` Rafael J. Wysocki
2 siblings, 1 reply; 15+ messages in thread
From: Andrew Morton @ 2008-09-05 4:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Rafael J. Wysocki
On Thu, 4 Sep 2008 19:36:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
The infamous Vaio hasn't finished catching up with you guys yet.
Something in linux-next broke suspend-to-RAM.
An `echo mem > /sys/power/state' causes "Freezing of tasks failed after
20.00 seconds (1 tasks refusing to freeze):"
dmesg: http://userweb.kernel.org/~akpm/dmesg-sony-suspend.txt
config: http://userweb.kernel.org/~akpm/config-sony.txt
This only happens after the X server has been started.
Mainline is OK.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-05 4:44 ` Andrew Morton
@ 2008-09-05 10:56 ` Rafael J. Wysocki
2008-09-05 18:30 ` Andrew Morton
0 siblings, 1 reply; 15+ messages in thread
From: Rafael J. Wysocki @ 2008-09-05 10:56 UTC (permalink / raw)
To: Andrew Morton; +Cc: Stephen Rothwell, linux-next, LKML
On Friday, 5 of September 2008, Andrew Morton wrote:
> On Thu, 4 Sep 2008 19:36:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
>
> The infamous Vaio hasn't finished catching up with you guys yet.
> Something in linux-next broke suspend-to-RAM.
>
> An `echo mem > /sys/power/state' causes "Freezing of tasks failed after
> 20.00 seconds (1 tasks refusing to freeze):"
>
> dmesg: http://userweb.kernel.org/~akpm/dmesg-sony-suspend.txt
> config: http://userweb.kernel.org/~akpm/config-sony.txt
>
> This only happens after the X server has been started.
>
> Mainline is OK.
According to your dmesg the process that refused to freeze was
hald-addon-stor
which got stuck in ... getnstimeofday (???) (can you check what
source code corresponds to getnstimeofday+0x37/0xbc pls?):
hald-addon-st D 00000046 0 2322 2282
f4de5b74 00000046 f4de5b54 00000046 f4de5b5c c0135f56 f6b96e44 f4deaf40
f4deb0bc f5580948 f4de5bb0 f4de5b6c c013336e f6aa77c8 f6aa77c8 f6aa77a0
f4de5bb0 f4de5b7c c0331f09 f4de5bd0 c01f4205 00000000 00000000 00000000
Call Trace:
[<c0135f56>] ? getnstimeofday+0x37/0xbc
[<c013336e>] ? ktime_get_ts+0x40/0x44
[<c0331f09>] io_schedule+0x39/0x6c
[<c01f4205>] get_request_wait+0x80/0xcd
[<c0130615>] ? autoremove_wake_function+0x0/0x33
[<c01f4285>] blk_get_request+0x33/0x5f
[<c027a2a5>] scsi_execute+0x1f/0x10a
[<c027a40a>] scsi_execute_req+0x7a/0x97
[<f862c0f9>] sr_test_unit_ready+0x39/0x95 [sr_mod]
[<f862ccbf>] sr_media_change+0x3c/0x1f9 [sr_mod]
[<c0331d2f>] ? schedule+0x438/0x451
[<f85c1073>] media_changed+0x43/0x71 [cdrom]
[<f85c10cd>] cdrom_media_changed+0x2c/0x32 [cdrom]
[<f862c19e>] sr_block_media_changed+0x11/0x13 [sr_mod]
[<c019eee0>] check_disk_change+0x1c/0x79
[<f85c4c72>] cdrom_open+0x7ec/0x85a [cdrom]
[<c01d8499>] ? avc_has_perm_noaudit+0x38c/0x42e
[<c01d84c0>] ? avc_has_perm_noaudit+0x3b3/0x42e
[<c01f62e4>] ? blk_execute_rq_nowait+0x74/0x7c
[<c01d8129>] ? avc_has_perm_noaudit+0x1c/0x42e
[<c01d84c0>] ? avc_has_perm_noaudit+0x3b3/0x42e
[<c033264f>] ? mutex_unlock+0x8/0xa
[<c013d4c5>] ? trace_hardirqs_on+0xb/0xd
[<f862c25d>] sr_block_open+0x83/0x91 [sr_mod]
[<c019f48a>] do_open+0xa9/0x2b5
[<c019f94b>] blkdev_open+0x28/0x51
[<c017df80>] __dentry_open+0x181/0x29f
[<c017edc5>] nameidata_to_filp+0x2b/0x42
[<c019f923>] ? blkdev_open+0x0/0x51
[<c0189251>] do_filp_open+0x391/0x662
[<c013d4c5>] ? trace_hardirqs_on+0xb/0xd
[<c018ffe9>] ? alloc_fd+0xbf/0xc9
[<c018ffe9>] ? alloc_fd+0xbf/0xc9
[<c017f0a8>] do_sys_open+0x44/0xb9
[<c017f15f>] sys_open+0x1e/0x26
[<c0103925>] sysenter_do_call+0x12/0x31
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-05 10:56 ` Rafael J. Wysocki
@ 2008-09-05 18:30 ` Andrew Morton
2008-09-06 11:25 ` Rafael J. Wysocki
0 siblings, 1 reply; 15+ messages in thread
From: Andrew Morton @ 2008-09-05 18:30 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Stephen Rothwell, linux-next, LKML
On Fri, 5 Sep 2008 12:56:35 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> On Friday, 5 of September 2008, Andrew Morton wrote:
> > On Thu, 4 Sep 2008 19:36:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > I have created today's linux-next tree at
> > > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> >
> > The infamous Vaio hasn't finished catching up with you guys yet.
> > Something in linux-next broke suspend-to-RAM.
> >
> > An `echo mem > /sys/power/state' causes "Freezing of tasks failed after
> > 20.00 seconds (1 tasks refusing to freeze):"
> >
> > dmesg: http://userweb.kernel.org/~akpm/dmesg-sony-suspend.txt
> > config: http://userweb.kernel.org/~akpm/config-sony.txt
> >
> > This only happens after the X server has been started.
> >
> > Mainline is OK.
>
> According to your dmesg the process that refused to freeze was
>
> hald-addon-stor
>
> which got stuck in ... getnstimeofday (???) (can you check what
> source code corresponds to getnstimeofday+0x37/0xbc pls?):
>
> hald-addon-st D 00000046 0 2322 2282
> f4de5b74 00000046 f4de5b54 00000046 f4de5b5c c0135f56 f6b96e44 f4deaf40
> f4deb0bc f5580948 f4de5bb0 f4de5b6c c013336e f6aa77c8 f6aa77c8 f6aa77a0
> f4de5bb0 f4de5b7c c0331f09 f4de5bd0 c01f4205 00000000 00000000 00000000
> Call Trace:
> [<c0135f56>] ? getnstimeofday+0x37/0xbc
> [<c013336e>] ? ktime_get_ts+0x40/0x44
> [<c0331f09>] io_schedule+0x39/0x6c
> [<c01f4205>] get_request_wait+0x80/0xcd
> ...
(gdb) x/60i getnstimeofday
0xc0135d63 <getnstimeofday>: push %ebp
0xc0135d64 <getnstimeofday+1>: mov %esp,%ebp
0xc0135d66 <getnstimeofday+3>: push %edi
0xc0135d67 <getnstimeofday+4>: push %esi
0xc0135d68 <getnstimeofday+5>: push %ebx
0xc0135d69 <getnstimeofday+6>: sub $0x8,%esp
0xc0135d6c <getnstimeofday+9>: mov %eax,0xffffffec(%ebp)
0xc0135d6f <getnstimeofday+12>: mov 0xc045a2c0,%eax
0xc0135d74 <getnstimeofday+17>: mov %eax,0xfffffff0(%ebp)
0xc0135d77 <getnstimeofday+20>: test $0x1,%al
0xc0135d79 <getnstimeofday+22>: je 0xc0135d7f <getnstimeofday+28>
0xc0135d7b <getnstimeofday+24>: pause
0xc0135d7d <getnstimeofday+26>: jmp 0xc0135d6f <getnstimeofday+12>
0xc0135d7f <getnstimeofday+28>: mov 0xffffffec(%ebp),%ecx
0xc0135d82 <getnstimeofday+31>: mov 0xc05db920,%eax
0xc0135d87 <getnstimeofday+36>: mov 0xc05db924,%edx
0xc0135d8d <getnstimeofday+42>: mov %eax,(%ecx)
0xc0135d8f <getnstimeofday+44>: mov %edx,0x4(%ecx)
0xc0135d92 <getnstimeofday+47>: mov 0xc05db938,%eax
0xc0135d97 <getnstimeofday+52>: call *0x10(%eax)
0xc0135d9a <getnstimeofday+55>: mov 0xc05db938,%esi
0xc0135da0 <getnstimeofday+61>: mov 0x1c(%esi),%ecx
0xc0135da3 <getnstimeofday+64>: sub 0x48(%esi),%eax
0xc0135da6 <getnstimeofday+67>: sbb 0x4c(%esi),%edx
0xc0135da9 <getnstimeofday+70>: and 0x14(%esi),%eax
0xc0135dac <getnstimeofday+73>: and 0x18(%esi),%edx
0xc0135daf <getnstimeofday+76>: mov %edx,%edi
0xc0135db1 <getnstimeofday+78>: imul %ecx,%edi
0xc0135db4 <getnstimeofday+81>: mul %ecx
0xc0135db6 <getnstimeofday+83>: mov 0x24(%esi),%ecx
0xc0135db9 <getnstimeofday+86>: lea (%edi,%edx,1),%edx
0xc0135dbc <getnstimeofday+89>: mov %eax,%ebx
0xc0135dbe <getnstimeofday+91>: mov %edx,%esi
0xc0135dc0 <getnstimeofday+93>: xor %edi,%edi
0xc0135dc2 <getnstimeofday+95>: shrd %cl,%edx,%ebx
0xc0135dc5 <getnstimeofday+98>: shr %cl,%esi
0xc0135dc7 <getnstimeofday+100>: test $0x20,%cl
0xc0135dca <getnstimeofday+103>: cmovne %esi,%ebx
0xc0135dcd <getnstimeofday+106>: cmovne %edi,%esi
0xc0135dd0 <getnstimeofday+109>: mov %ebx,%edx
(gdb) l *0xc0135d9a
0xc0135d9a is in getnstimeofday (kernel/time/timekeeping.c:104).
99
100 /* read clocksource: */
101 cycle_now = clocksource_read(clock);
102
103 /* calculate the delta since the last update_wall_time: */
104 cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
105
106 /* convert to nanoseconds: */
107 nsecs = cyc2ns(clock, cycle_delta);
108
Which implies that someone mucked up xtime_lock.
But I don't think any of that is correct. The getnstimeofday is just
stack gunk. hald is in D state and is asleep in get_request_wait().
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-05 18:30 ` Andrew Morton
@ 2008-09-06 11:25 ` Rafael J. Wysocki
2008-09-06 13:42 ` James Bottomley
0 siblings, 1 reply; 15+ messages in thread
From: Rafael J. Wysocki @ 2008-09-06 11:25 UTC (permalink / raw)
To: Andrew Morton; +Cc: Stephen Rothwell, linux-next, LKML, linux-scsi, linux-ide
On Friday, 5 of September 2008, Andrew Morton wrote:
> On Fri, 5 Sep 2008 12:56:35 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> > On Friday, 5 of September 2008, Andrew Morton wrote:
> > > On Thu, 4 Sep 2008 19:36:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > > I have created today's linux-next tree at
> > > > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> > >
> > > The infamous Vaio hasn't finished catching up with you guys yet.
> > > Something in linux-next broke suspend-to-RAM.
> > >
> > > An `echo mem > /sys/power/state' causes "Freezing of tasks failed after
> > > 20.00 seconds (1 tasks refusing to freeze):"
> > >
> > > dmesg: http://userweb.kernel.org/~akpm/dmesg-sony-suspend.txt
> > > config: http://userweb.kernel.org/~akpm/config-sony.txt
> > >
> > > This only happens after the X server has been started.
> > >
> > > Mainline is OK.
> >
> > According to your dmesg the process that refused to freeze was
> >
> > hald-addon-stor
> >
> > which got stuck in ... getnstimeofday (???) (can you check what
> > source code corresponds to getnstimeofday+0x37/0xbc pls?):
> >
> > hald-addon-st D 00000046 0 2322 2282
> > f4de5b74 00000046 f4de5b54 00000046 f4de5b5c c0135f56 f6b96e44 f4deaf40
> > f4deb0bc f5580948 f4de5bb0 f4de5b6c c013336e f6aa77c8 f6aa77c8 f6aa77a0
> > f4de5bb0 f4de5b7c c0331f09 f4de5bd0 c01f4205 00000000 00000000 00000000
> > Call Trace:
> > [<c0135f56>] ? getnstimeofday+0x37/0xbc
> > [<c013336e>] ? ktime_get_ts+0x40/0x44
> > [<c0331f09>] io_schedule+0x39/0x6c
> > [<c01f4205>] get_request_wait+0x80/0xcd
> > ...
>
> (gdb) x/60i getnstimeofday
> 0xc0135d63 <getnstimeofday>: push %ebp
> 0xc0135d64 <getnstimeofday+1>: mov %esp,%ebp
> 0xc0135d66 <getnstimeofday+3>: push %edi
> 0xc0135d67 <getnstimeofday+4>: push %esi
> 0xc0135d68 <getnstimeofday+5>: push %ebx
> 0xc0135d69 <getnstimeofday+6>: sub $0x8,%esp
> 0xc0135d6c <getnstimeofday+9>: mov %eax,0xffffffec(%ebp)
> 0xc0135d6f <getnstimeofday+12>: mov 0xc045a2c0,%eax
> 0xc0135d74 <getnstimeofday+17>: mov %eax,0xfffffff0(%ebp)
> 0xc0135d77 <getnstimeofday+20>: test $0x1,%al
> 0xc0135d79 <getnstimeofday+22>: je 0xc0135d7f <getnstimeofday+28>
> 0xc0135d7b <getnstimeofday+24>: pause
> 0xc0135d7d <getnstimeofday+26>: jmp 0xc0135d6f <getnstimeofday+12>
> 0xc0135d7f <getnstimeofday+28>: mov 0xffffffec(%ebp),%ecx
> 0xc0135d82 <getnstimeofday+31>: mov 0xc05db920,%eax
> 0xc0135d87 <getnstimeofday+36>: mov 0xc05db924,%edx
> 0xc0135d8d <getnstimeofday+42>: mov %eax,(%ecx)
> 0xc0135d8f <getnstimeofday+44>: mov %edx,0x4(%ecx)
> 0xc0135d92 <getnstimeofday+47>: mov 0xc05db938,%eax
> 0xc0135d97 <getnstimeofday+52>: call *0x10(%eax)
> 0xc0135d9a <getnstimeofday+55>: mov 0xc05db938,%esi
> 0xc0135da0 <getnstimeofday+61>: mov 0x1c(%esi),%ecx
> 0xc0135da3 <getnstimeofday+64>: sub 0x48(%esi),%eax
> 0xc0135da6 <getnstimeofday+67>: sbb 0x4c(%esi),%edx
> 0xc0135da9 <getnstimeofday+70>: and 0x14(%esi),%eax
> 0xc0135dac <getnstimeofday+73>: and 0x18(%esi),%edx
> 0xc0135daf <getnstimeofday+76>: mov %edx,%edi
> 0xc0135db1 <getnstimeofday+78>: imul %ecx,%edi
> 0xc0135db4 <getnstimeofday+81>: mul %ecx
> 0xc0135db6 <getnstimeofday+83>: mov 0x24(%esi),%ecx
> 0xc0135db9 <getnstimeofday+86>: lea (%edi,%edx,1),%edx
> 0xc0135dbc <getnstimeofday+89>: mov %eax,%ebx
> 0xc0135dbe <getnstimeofday+91>: mov %edx,%esi
> 0xc0135dc0 <getnstimeofday+93>: xor %edi,%edi
> 0xc0135dc2 <getnstimeofday+95>: shrd %cl,%edx,%ebx
> 0xc0135dc5 <getnstimeofday+98>: shr %cl,%esi
> 0xc0135dc7 <getnstimeofday+100>: test $0x20,%cl
> 0xc0135dca <getnstimeofday+103>: cmovne %esi,%ebx
> 0xc0135dcd <getnstimeofday+106>: cmovne %edi,%esi
> 0xc0135dd0 <getnstimeofday+109>: mov %ebx,%edx
>
> (gdb) l *0xc0135d9a
> 0xc0135d9a is in getnstimeofday (kernel/time/timekeeping.c:104).
> 99
> 100 /* read clocksource: */
> 101 cycle_now = clocksource_read(clock);
> 102
> 103 /* calculate the delta since the last update_wall_time: */
> 104 cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
> 105
> 106 /* convert to nanoseconds: */
> 107 nsecs = cyc2ns(clock, cycle_delta);
> 108
>
> Which implies that someone mucked up xtime_lock.
>
> But I don't think any of that is correct. The getnstimeofday is just
> stack gunk. hald is in D state and is asleep in get_request_wait().
Right. It looks like there was a media change in the CD drive and hald was
waiting for the device in sr_test_unit_ready() forever. Apparently, the device
could not get ready.
It looks like a SATA/ATA (whatever the CD-ROM is attached to) issue or sr_mod
breakage.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2008-09-06 11:25 ` Rafael J. Wysocki
@ 2008-09-06 13:42 ` James Bottomley
0 siblings, 0 replies; 15+ messages in thread
From: James Bottomley @ 2008-09-06 13:42 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Andrew Morton, Stephen Rothwell, linux-next, LKML, linux-scsi,
linux-ide
On Sat, 2008-09-06 at 13:25 +0200, Rafael J. Wysocki wrote:
> On Friday, 5 of September 2008, Andrew Morton wrote:
> > On Fri, 5 Sep 2008 12:56:35 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > > On Friday, 5 of September 2008, Andrew Morton wrote:
> > > > On Thu, 4 Sep 2008 19:36:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > > I have created today's linux-next tree at
> > > > > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> > > >
> > > > The infamous Vaio hasn't finished catching up with you guys yet.
> > > > Something in linux-next broke suspend-to-RAM.
> > > >
> > > > An `echo mem > /sys/power/state' causes "Freezing of tasks failed after
> > > > 20.00 seconds (1 tasks refusing to freeze):"
> > > >
> > > > dmesg: http://userweb.kernel.org/~akpm/dmesg-sony-suspend.txt
> > > > config: http://userweb.kernel.org/~akpm/config-sony.txt
> > > >
> > > > This only happens after the X server has been started.
> > > >
> > > > Mainline is OK.
> > >
> > > According to your dmesg the process that refused to freeze was
> > >
> > > hald-addon-stor
> > >
> > > which got stuck in ... getnstimeofday (???) (can you check what
> > > source code corresponds to getnstimeofday+0x37/0xbc pls?):
> > >
> > > hald-addon-st D 00000046 0 2322 2282
> > > f4de5b74 00000046 f4de5b54 00000046 f4de5b5c c0135f56 f6b96e44 f4deaf40
> > > f4deb0bc f5580948 f4de5bb0 f4de5b6c c013336e f6aa77c8 f6aa77c8 f6aa77a0
> > > f4de5bb0 f4de5b7c c0331f09 f4de5bd0 c01f4205 00000000 00000000 00000000
> > > Call Trace:
> > > [<c0135f56>] ? getnstimeofday+0x37/0xbc
> > > [<c013336e>] ? ktime_get_ts+0x40/0x44
> > > [<c0331f09>] io_schedule+0x39/0x6c
> > > [<c01f4205>] get_request_wait+0x80/0xcd
> > > ...
> >
> > (gdb) x/60i getnstimeofday
> > 0xc0135d63 <getnstimeofday>: push %ebp
> > 0xc0135d64 <getnstimeofday+1>: mov %esp,%ebp
> > 0xc0135d66 <getnstimeofday+3>: push %edi
> > 0xc0135d67 <getnstimeofday+4>: push %esi
> > 0xc0135d68 <getnstimeofday+5>: push %ebx
> > 0xc0135d69 <getnstimeofday+6>: sub $0x8,%esp
> > 0xc0135d6c <getnstimeofday+9>: mov %eax,0xffffffec(%ebp)
> > 0xc0135d6f <getnstimeofday+12>: mov 0xc045a2c0,%eax
> > 0xc0135d74 <getnstimeofday+17>: mov %eax,0xfffffff0(%ebp)
> > 0xc0135d77 <getnstimeofday+20>: test $0x1,%al
> > 0xc0135d79 <getnstimeofday+22>: je 0xc0135d7f <getnstimeofday+28>
> > 0xc0135d7b <getnstimeofday+24>: pause
> > 0xc0135d7d <getnstimeofday+26>: jmp 0xc0135d6f <getnstimeofday+12>
> > 0xc0135d7f <getnstimeofday+28>: mov 0xffffffec(%ebp),%ecx
> > 0xc0135d82 <getnstimeofday+31>: mov 0xc05db920,%eax
> > 0xc0135d87 <getnstimeofday+36>: mov 0xc05db924,%edx
> > 0xc0135d8d <getnstimeofday+42>: mov %eax,(%ecx)
> > 0xc0135d8f <getnstimeofday+44>: mov %edx,0x4(%ecx)
> > 0xc0135d92 <getnstimeofday+47>: mov 0xc05db938,%eax
> > 0xc0135d97 <getnstimeofday+52>: call *0x10(%eax)
> > 0xc0135d9a <getnstimeofday+55>: mov 0xc05db938,%esi
> > 0xc0135da0 <getnstimeofday+61>: mov 0x1c(%esi),%ecx
> > 0xc0135da3 <getnstimeofday+64>: sub 0x48(%esi),%eax
> > 0xc0135da6 <getnstimeofday+67>: sbb 0x4c(%esi),%edx
> > 0xc0135da9 <getnstimeofday+70>: and 0x14(%esi),%eax
> > 0xc0135dac <getnstimeofday+73>: and 0x18(%esi),%edx
> > 0xc0135daf <getnstimeofday+76>: mov %edx,%edi
> > 0xc0135db1 <getnstimeofday+78>: imul %ecx,%edi
> > 0xc0135db4 <getnstimeofday+81>: mul %ecx
> > 0xc0135db6 <getnstimeofday+83>: mov 0x24(%esi),%ecx
> > 0xc0135db9 <getnstimeofday+86>: lea (%edi,%edx,1),%edx
> > 0xc0135dbc <getnstimeofday+89>: mov %eax,%ebx
> > 0xc0135dbe <getnstimeofday+91>: mov %edx,%esi
> > 0xc0135dc0 <getnstimeofday+93>: xor %edi,%edi
> > 0xc0135dc2 <getnstimeofday+95>: shrd %cl,%edx,%ebx
> > 0xc0135dc5 <getnstimeofday+98>: shr %cl,%esi
> > 0xc0135dc7 <getnstimeofday+100>: test $0x20,%cl
> > 0xc0135dca <getnstimeofday+103>: cmovne %esi,%ebx
> > 0xc0135dcd <getnstimeofday+106>: cmovne %edi,%esi
> > 0xc0135dd0 <getnstimeofday+109>: mov %ebx,%edx
> >
> > (gdb) l *0xc0135d9a
> > 0xc0135d9a is in getnstimeofday (kernel/time/timekeeping.c:104).
> > 99
> > 100 /* read clocksource: */
> > 101 cycle_now = clocksource_read(clock);
> > 102
> > 103 /* calculate the delta since the last update_wall_time: */
> > 104 cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
> > 105
> > 106 /* convert to nanoseconds: */
> > 107 nsecs = cyc2ns(clock, cycle_delta);
> > 108
> >
> > Which implies that someone mucked up xtime_lock.
> >
> > But I don't think any of that is correct. The getnstimeofday is just
> > stack gunk. hald is in D state and is asleep in get_request_wait().
>
> Right. It looks like there was a media change in the CD drive and hald was
> waiting for the device in sr_test_unit_ready() forever. Apparently, the device
> could not get ready.
>
> It looks like a SATA/ATA (whatever the CD-ROM is attached to) issue or sr_mod
> breakage.
Um, I don't see how that follows.
get_request_wait() is the first thing the block layer does to try to get
a request structure for the queue. If it's stuck there it means that
block was out of requests and is waiting for some memory to free up. If
we're stuck there, nothing went down to the CD.
However, being stuck here really isn't good news. These things are
mempool backed to prevent writeout deadlock ... we shouldn't be running
out of them. What does
/sys/block/<dev>/queue/nr_reqeusts
and
/sys/block/<dev>/stat
say for this device?
James
^ permalink raw reply [flat|nested] 15+ messages in thread
* linux-next: Tree for September 4
@ 2009-09-04 8:23 Stephen Rothwell
2009-09-04 10:36 ` [Patch -next] Fix net/3c503.c build break Sachin Sant
2009-09-04 10:45 ` linux-next: Tree for September 4 Borislav Petkov
0 siblings, 2 replies; 15+ messages in thread
From: Stephen Rothwell @ 2009-09-04 8:23 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8883 bytes --]
Hi all,
Changes since 20090903:
The xfs tree gained a conflict against the ext3 tree.
The acpi tree still has a build failure so I used the version from
next-20090831.
The security-testing tree still has a build failure so I used the version
of the tree from next-20090902.
The staging tree gained a conflict against the net tree.
----------------------------------------------------------------------------
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 141 trees (counting Linus' and 21 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
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 ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c
Applying: pci: merge fixup for fundamental reset conflict with powerpc tree
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/gspca/Kconfig
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090831/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
CONFLICT (content): Merge conflict in arch/arm/kernel/signal.c
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Applying: security: fix merge for tun_struct changes
$ git reset --hard HEAD^
Merging refs/next/20090902/security-testing
Applying: security: fix merge for tun_struct changes
Merging lblnet/master
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging agp/agp-next
CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in kernel/sched.c
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
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
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/at76_usb/at76_usb.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/at76_usb/at76_usb.c left in tree.
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
$ git rm -f drivers/staging/at76_usb/at76_usb.c
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Patch -next] Fix net/3c503.c build break
2009-09-04 8:23 linux-next: Tree for September 4 Stephen Rothwell
@ 2009-09-04 10:36 ` Sachin Sant
2009-09-04 10:41 ` David Miller
2009-09-04 10:45 ` linux-next: Tree for September 4 Borislav Petkov
1 sibling, 1 reply; 15+ messages in thread
From: Sachin Sant @ 2009-09-04 10:36 UTC (permalink / raw)
To: netdev; +Cc: linux-next, David Miller
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
Today's Next failed to build on a x86 box with following error.
drivers/net/3c503.c: In function 'el2_open':
drivers/net/3c503.c:406: error: 'reval' undeclared (first use in this function)
drivers/net/3c503.c:406: error: (Each undeclared identifier is reported only once
drivers/net/3c503.c:406: error: for each function it appears in.)
Most probably because of commit ab08999d6029bb2c79c16be5405d63d2bedbdfea
The patch had a typo in it. Below patch fixes the issue for me.
Thanks
-Sachin
[-- Attachment #2: net-3c503-typo-fix.patch --]
[-- Type: text/x-patch, Size: 497 bytes --]
Fix a build break because of a typo in drivers/net/3c503.c
Signed-off-by: Sachin Sant <sachinp@in.ibm.com>
---
diff -Naurp a/drivers/net/3c503.c b/drivers/net/3c503.c
--- a/drivers/net/3c503.c 2009-09-04 15:50:06.000000000 +0530
+++ b/drivers/net/3c503.c 2009-09-04 15:50:41.000000000 +0530
@@ -403,7 +403,7 @@ el2_open(struct net_device *dev)
break;
} else {
if (retval != -EBUSY)
- return reval;
+ return retval;
}
} while (*++irqp);
if (*irqp == 0) {
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch -next] Fix net/3c503.c build break
2009-09-04 10:36 ` [Patch -next] Fix net/3c503.c build break Sachin Sant
@ 2009-09-04 10:41 ` David Miller
0 siblings, 0 replies; 15+ messages in thread
From: David Miller @ 2009-09-04 10:41 UTC (permalink / raw)
To: sachinp; +Cc: netdev, linux-next
From: Sachin Sant <sachinp@in.ibm.com>
Date: Fri, 04 Sep 2009 16:06:02 +0530
> Today's Next failed to build on a x86 box with following error.
>
> drivers/net/3c503.c: In function 'el2_open':
> drivers/net/3c503.c:406: error: 'reval' undeclared (first use in this
> function)
> drivers/net/3c503.c:406: error: (Each undeclared identifier is
> reported only once
> drivers/net/3c503.c:406: error: for each function it appears in.)
>
> Most probably because of commit
> ab08999d6029bb2c79c16be5405d63d2bedbdfea
> The patch had a typo in it. Below patch fixes the issue for me.
Applied, thank you.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2009-09-04 8:23 linux-next: Tree for September 4 Stephen Rothwell
2009-09-04 10:36 ` [Patch -next] Fix net/3c503.c build break Sachin Sant
@ 2009-09-04 10:45 ` Borislav Petkov
2009-09-07 16:19 ` Stephen Rothwell
1 sibling, 1 reply; 15+ messages in thread
From: Borislav Petkov @ 2009-09-04 10:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
Hi Stephen,
On Fri, Sep 04, 2009 at 06:23:09PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090903:
..
> Merging edac-amd/for-next
> CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
> CONFLICT (content): Merge conflict in include/linux/topology.h
current topology patches in -tip have significantly diverged from the
versions I carry in the edac tree so please remove the last from the
testing lineup temporarily. Will fix the issue after I'm back from my
vacation the week after next.
Thanks.
--
Regards/Gruss,
Boris.
Operating | Advanced Micro Devices GmbH
System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany
Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
(OSRC) | Registergericht München, HRB Nr. 43632
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: linux-next: Tree for September 4
2009-09-04 10:45 ` linux-next: Tree for September 4 Borislav Petkov
@ 2009-09-07 16:19 ` Stephen Rothwell
0 siblings, 0 replies; 15+ messages in thread
From: Stephen Rothwell @ 2009-09-07 16:19 UTC (permalink / raw)
To: Borislav Petkov; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
Hi Borislav,
On Fri, 4 Sep 2009 12:45:40 +0200 Borislav Petkov <borislav.petkov@amd.com> wrote:
>
> current topology patches in -tip have significantly diverged from the
> versions I carry in the edac tree so please remove the last from the
> testing lineup temporarily. Will fix the issue after I'm back from my
> vacation the week after next.
OK, done. Just let me know when you have returned and I will reinstate it.
--
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] 15+ messages in thread
end of thread, other threads:[~2009-09-07 16:19 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-04 8:23 linux-next: Tree for September 4 Stephen Rothwell
2009-09-04 10:36 ` [Patch -next] Fix net/3c503.c build break Sachin Sant
2009-09-04 10:41 ` David Miller
2009-09-04 10:45 ` linux-next: Tree for September 4 Borislav Petkov
2009-09-07 16:19 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-09-04 9:36 Stephen Rothwell
2008-09-04 11:52 ` Alan Cox
2008-09-04 12:51 ` Stephen Rothwell
2008-09-04 23:53 ` Andrew Morton
2008-09-05 0:07 ` David Woodhouse
2008-09-05 4:44 ` Andrew Morton
2008-09-05 10:56 ` Rafael J. Wysocki
2008-09-05 18:30 ` Andrew Morton
2008-09-06 11:25 ` Rafael J. Wysocki
2008-09-06 13:42 ` James Bottomley
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).