* linux-next: Tree for August 13
@ 2010-08-13 3:13 Stephen Rothwell
2010-08-14 2:47 ` linux-next: Tree for August 13 (ceph) Randy Dunlap
0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2010-08-13 3:13 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8743 bytes --]
Hi all,
As the merge window is open, please do not add 2.6.37 material to your
linux-next included trees until after 2.6.36-rc1.
Changes since 20100812:
The ceph tree gained a conflict against Linus' tree.
The cifs tree lost its build failure.
The ocfs2 tree gained a conflict against Linus' tree.
The acpi tree gained a build failure for which I applied a patch.
The swiotlb-xen tree lost its conflicts.
The rr tree lost its merge fix patches.
The battery tree lost its conflicts.
The mfd tree lost its conflict.
the hwpoison tree lost its conflict.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 169 trees (counting Linus' and 22 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig
CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c
Merging s5p/for-next
Merging tegra/for-next
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
CONFLICT (content): Merge conflict in drivers/Makefile
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
CONFLICT (content): Merge conflict in net/Makefile
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
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-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/cx23885/Kconfig
CONFLICT (add/add): Merge conflict in drivers/media/video/v4l2-ctrls.c
Applying: v4l-dvb: fix up bad automatic merge
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Applying: acpi: using copy_from_user needs linux/uaccess.h
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
Merging ibft/master
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 arch/um/drivers/hostaudio_kern.c
CONFLICT (content): Merge conflict in drivers/acpi/debug.c
CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
CONFLICT (content): Merge conflict in kernel/module.c
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
Merging alacrity/linux-next
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging devicetree/next-devicetree
Merging spi/next-spi
CONFLICT (content): Merge conflict in drivers/spi/mpc512x_psc_spi.c
Applying: spi: update for of_device to platform_device replacement
Merging limits/writable_limits
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging tip/auto-latest
Merging lost-spurious-irq/lost-spurious-irq
CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c
CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c
CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c
CONFLICT (content): Merge conflict in include/linux/libata.h
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for August 13 (ceph)
2010-08-13 3:13 linux-next: Tree for August 13 Stephen Rothwell
@ 2010-08-14 2:47 ` Randy Dunlap
0 siblings, 0 replies; 10+ messages in thread
From: Randy Dunlap @ 2010-08-14 2:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
On Fri, 13 Aug 2010 13:13:47 +1000 Stephen Rothwell wrote:
> Hi all,
>
> As the merge window is open, please do not add 2.6.37 material to your
> linux-next included trees until after 2.6.36-rc1.
>
> Changes since 20100812:
>
> The ceph tree gained a conflict against Linus' tree.
When CONFIG_NET is not enabled:
ERROR: "kernel_sendmsg" [net/ceph/libceph.ko] undefined!
ERROR: "sock_release" [net/ceph/libceph.ko] undefined!
ERROR: "sock_create_kern" [net/ceph/libceph.ko] undefined!
ERROR: "kernel_sendpage" [net/ceph/libceph.ko] undefined!
ERROR: "in4_pton" [net/ceph/libceph.ko] undefined!
ERROR: "kernel_recvmsg" [net/ceph/libceph.ko] undefined!
ERROR: "in6_pton" [net/ceph/libceph.ko] undefined!
so my earlier comment about CEPH_LIB depending on INET should take
care of this one also.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 10+ messages in thread
* linux-next: Tree for August 13
@ 2009-08-13 10:05 Stephen Rothwell
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2009-08-13 10:05 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8642 bytes --]
Hi all,
News:
The git tree is now hosted at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git and the
patches are now at http://www.kernel.org/pub/linux/kernel/v2.6/next/ .
There are symlinks from the old locations (so they will continue to work).
Changes since 20090812:
This tree fails to build for powerpc allyesconfig (due to a TOC overflow
problem in the final link).
The v4l-dvb tree got its conflicts back (it looks like the davinci
patches were removed and then readded).
The kvm tree gained a build failure so I used the version from
next-20090812.
The percup tree lost 2 conflicts.
----------------------------------------------------------------------------
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) 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 140 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
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
$ git reset --hard HEAD^
Merging refs/next/20090812/kvm
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/socket.h
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Applying: drbd: fix for removal of blk_queue_stack_limits
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
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
Merging sfi/sfi-test
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
CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c
CONFLICT (content): Merge conflict in drivers/usb/host/r8a66597-hcd.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for August 13
2008-08-13 14:40 ` Takashi Iwai
@ 2008-08-14 9:57 ` Takashi Iwai
0 siblings, 0 replies; 10+ messages in thread
From: Takashi Iwai @ 2008-08-14 9:57 UTC (permalink / raw)
To: Alan Cox; +Cc: Stephen Rothwell, linux-next, LKML
At Wed, 13 Aug 2008 16:40:37 +0200,
I wrote:
>
> At Wed, 13 Aug 2008 15:37:15 +0200,
> I wrote:
> >
> > At Wed, 13 Aug 2008 14:08:11 +0100,
> > Alan Cox wrote:
> > >
> > > > When re-starting X, it complains that it cannot change to VT7.
> > > > Via strace,
> > >
> > > Does this fix it
> > >
> > > @@ -838,6 +839,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
> > > void __cleanup_signal(struct signal_struct *sig)
> > > {
> > > exit_thread_group_keys(sig);
> > > + tty_kref_put(sig->tty);
> > > kmem_cache_free(signal_cachep, sig);
> > > }
> >
> > Thanks, will give it a try.
> >
> > The above can't be applied as is to next tree, so the following is
> > applied instead.
>
> It oopsed with udevd at the early boot stage...
>
> BUG: unable to handle kernel paging request at 4455003d
> IP: [<c01e9b69>] kref_put+0x29/0x44
> *pde = 00000000
> Oops: 0002 [#1] SMP
> last sysfs file: /sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/timeout
> Modules linked in: sd_mod crc_t10dif uhci_hcd ehci_hcd usbcore edd ext3 mbcache jbd fan ata_piix libata scsi_mod dock thermal processor
>
> Pid: 638, comm: udevd Not tainted (2.6.27-rc3-next-20080813-next #1)
> EIP: 0060:[<c01e9b69>] EFLAGS: 00010202 CPU: 1
> EIP is at kref_put+0x29/0x44
> EAX: 4455003d EBX: 4455003d ECX: c2005b8c EDX: 00000040
> ESI: c023b9ed EDI: fffffdff EBP: f6adff08 ESP: f6adff00
> DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
> Process udevd (pid: 638, ti=f6ade000 task=f6ac8000 task.ti=f6ade000)
> Stack: f6a3a200 f6abeec0 f6adff10 c023c2dc f6adff1c c0123d30 f6abec90 f6adff58
> c01252cf f6a3a200 00000082 f6adffb8 bfcc26a8 01200011 00000000 f6abee80
> f6ac8000 f6abe080 00000000 f6adffb8 bfcc26a8 00000000 f6adff98 c012546f
> Call Trace:
> [<c023c2dc>] ? tty_kref_put+0x14/0x16
> [<c0123d30>] ? __cleanup_signal+0x11/0x20
> [<c01252cf>] ? copy_process+0xde7/0xec6
> [<c012546f>] ? do_fork+0xc1/0x1ff
> [<c0102447>] ? sys_clone+0x25/0x2a
> [<c010399b>] ? sysenter_do_call+0x12/0x2f
> =======================
> Code: 5d c3 55 89 e5 56 89 d6 85 f6 ba 40 00 00 00 53 89 c3 74 0d 81 fe 63 cd 17 c0 75 0f ba 41 00 00 00 b8 aa 18 3c c0 e8 36 bf f3 ff <f0> ff 0b 0f 94 c0 31 d2 84 c0 74 09 89 d8 ff d6 ba 01 00 00 00
> EIP: [<c01e9b69>] kref_put+0x29/0x44 SS:ESP 0068:f6adff00
> ---[ end trace 2b6d2df1e77a968c ]---
Today's tree works fine. Thanks!
Takashi
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for August 13
2008-08-13 13:37 ` Takashi Iwai
@ 2008-08-13 14:40 ` Takashi Iwai
2008-08-14 9:57 ` Takashi Iwai
0 siblings, 1 reply; 10+ messages in thread
From: Takashi Iwai @ 2008-08-13 14:40 UTC (permalink / raw)
To: Alan Cox; +Cc: Stephen Rothwell, linux-next, LKML
At Wed, 13 Aug 2008 15:37:15 +0200,
I wrote:
>
> At Wed, 13 Aug 2008 14:08:11 +0100,
> Alan Cox wrote:
> >
> > > When re-starting X, it complains that it cannot change to VT7.
> > > Via strace,
> >
> > Does this fix it
> >
> > @@ -838,6 +839,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
> > void __cleanup_signal(struct signal_struct *sig)
> > {
> > exit_thread_group_keys(sig);
> > + tty_kref_put(sig->tty);
> > kmem_cache_free(signal_cachep, sig);
> > }
>
> Thanks, will give it a try.
>
> The above can't be applied as is to next tree, so the following is
> applied instead.
It oopsed with udevd at the early boot stage...
BUG: unable to handle kernel paging request at 4455003d
IP: [<c01e9b69>] kref_put+0x29/0x44
*pde = 00000000
Oops: 0002 [#1] SMP
last sysfs file: /sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/timeout
Modules linked in: sd_mod crc_t10dif uhci_hcd ehci_hcd usbcore edd ext3 mbcache jbd fan ata_piix libata scsi_mod dock thermal processor
Pid: 638, comm: udevd Not tainted (2.6.27-rc3-next-20080813-next #1)
EIP: 0060:[<c01e9b69>] EFLAGS: 00010202 CPU: 1
EIP is at kref_put+0x29/0x44
EAX: 4455003d EBX: 4455003d ECX: c2005b8c EDX: 00000040
ESI: c023b9ed EDI: fffffdff EBP: f6adff08 ESP: f6adff00
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
Process udevd (pid: 638, ti=f6ade000 task=f6ac8000 task.ti=f6ade000)
Stack: f6a3a200 f6abeec0 f6adff10 c023c2dc f6adff1c c0123d30 f6abec90 f6adff58
c01252cf f6a3a200 00000082 f6adffb8 bfcc26a8 01200011 00000000 f6abee80
f6ac8000 f6abe080 00000000 f6adffb8 bfcc26a8 00000000 f6adff98 c012546f
Call Trace:
[<c023c2dc>] ? tty_kref_put+0x14/0x16
[<c0123d30>] ? __cleanup_signal+0x11/0x20
[<c01252cf>] ? copy_process+0xde7/0xec6
[<c012546f>] ? do_fork+0xc1/0x1ff
[<c0102447>] ? sys_clone+0x25/0x2a
[<c010399b>] ? sysenter_do_call+0x12/0x2f
=======================
Code: 5d c3 55 89 e5 56 89 d6 85 f6 ba 40 00 00 00 53 89 c3 74 0d 81 fe 63 cd 17 c0 75 0f ba 41 00 00 00 b8 aa 18 3c c0 e8 36 bf f3 ff <f0> ff 0b 0f 94 c0 31 d2 84 c0 74 09 89 d8 ff d6 ba 01 00 00 00
EIP: [<c01e9b69>] kref_put+0x29/0x44 SS:ESP 0068:f6adff00
---[ end trace 2b6d2df1e77a968c ]---
Takashi
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for August 13
2008-08-13 13:08 ` Alan Cox
@ 2008-08-13 13:37 ` Takashi Iwai
2008-08-13 14:40 ` Takashi Iwai
0 siblings, 1 reply; 10+ messages in thread
From: Takashi Iwai @ 2008-08-13 13:37 UTC (permalink / raw)
To: Alan Cox; +Cc: Stephen Rothwell, linux-next, LKML
At Wed, 13 Aug 2008 14:08:11 +0100,
Alan Cox wrote:
>
> > When re-starting X, it complains that it cannot change to VT7.
> > Via strace,
>
> Does this fix it
>
> @@ -838,6 +839,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
> void __cleanup_signal(struct signal_struct *sig)
> {
> exit_thread_group_keys(sig);
> + tty_kref_put(sig->tty);
> kmem_cache_free(signal_cachep, sig);
> }
Thanks, will give it a try.
The above can't be applied as is to next tree, so the following is
applied instead.
Takashi
---
diff --git a/kernel/fork.c b/kernel/fork.c
index 600a264..2353660 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -834,6 +834,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
void __cleanup_signal(struct signal_struct *sig)
{
+ tty_kref_put(sig->tty);
kmem_cache_free(signal_cachep, sig);
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for August 13
2008-08-13 11:05 ` Takashi Iwai
2008-08-13 11:42 ` Stephen Rothwell
@ 2008-08-13 13:08 ` Alan Cox
2008-08-13 13:37 ` Takashi Iwai
1 sibling, 1 reply; 10+ messages in thread
From: Alan Cox @ 2008-08-13 13:08 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Stephen Rothwell, linux-next, LKML
> When re-starting X, it complains that it cannot change to VT7.
> Via strace,
Does this fix it
@@ -838,6 +839,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
void __cleanup_signal(struct signal_struct *sig)
{
exit_thread_group_keys(sig);
+ tty_kref_put(sig->tty);
kmem_cache_free(signal_cachep, sig);
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: Tree for August 13
2008-08-13 11:05 ` Takashi Iwai
@ 2008-08-13 11:42 ` Stephen Rothwell
2008-08-13 13:08 ` Alan Cox
1 sibling, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2008-08-13 11:42 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]
Hi Takashi,
On Wed, 13 Aug 2008 13:05:01 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> I got a problem regarding tty with today's tree.
> When re-starting X, it complains that it cannot change to VT7.
> Via strace,
>
> open("/dev/tty0", O_WRONLY) = 7
> ioctl(7, VIDIOC_QUERYCAP or VT_OPENQRY, 0x81e80c4) = 0
> close(7) = 0
> write(0, "(--) using VT number 7\n\n", 24) = 24
> getppid() = 3240
> getpgid(0xca8) = 3240
> setpgid(0, 3240) = 0
> setsid() = 3241
> open("/dev/vc/7", O_RDWR|O_NONBLOCK) = -1 ENOENT (No such file or directory)
> open("/dev/tty7", O_RDWR|O_NONBLOCK) = -1 EIO (Input/output error)
> write(2, "\nFatal server error:\n", 21) = 21
>
> A similar error can be seen at shutdown, complains about the tty error
> and the halt process hangs up.
>
> Unfortunately it's hard to bisect since Aug 11 and Aug 12 trees don't
> boot, and Aug 8 tree has a problem regarding cred...
But does -rc3 work? If so, then could you bisect from there to
next-20080813?
--
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] 10+ messages in thread
* Re: linux-next: Tree for August 13
2008-08-13 7:24 Stephen Rothwell
@ 2008-08-13 11:05 ` Takashi Iwai
2008-08-13 11:42 ` Stephen Rothwell
2008-08-13 13:08 ` Alan Cox
0 siblings, 2 replies; 10+ messages in thread
From: Takashi Iwai @ 2008-08-13 11:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
At Wed, 13 Aug 2008 17:24:52 +1000,
Stephen Rothwell wrote:
>
> Hi all,
>
> Changes since next-20080812:
>
> The ide tree lost its build fix patch.
>
> The slab tree gained a conflict against linus' tree.
>
> The kmemcheck tree gained 3 conflicts against the slab tree.
>
> The ttydev tree lost a conflict.
>
> I remerged Linus' tree at the end to reduce the size of the patches
> (since -rc3 had been released).
>
> I have also applied the following patches for known problems:
>
> Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
> xen-balloon: fix up sysfs issues
> ath9k: work around gcc ICE again
> usb: fix up use of usb_dbg
I got a problem regarding tty with today's tree.
When re-starting X, it complains that it cannot change to VT7.
Via strace,
open("/dev/tty0", O_WRONLY) = 7
ioctl(7, VIDIOC_QUERYCAP or VT_OPENQRY, 0x81e80c4) = 0
close(7) = 0
write(0, "(--) using VT number 7\n\n", 24) = 24
getppid() = 3240
getpgid(0xca8) = 3240
setpgid(0, 3240) = 0
setsid() = 3241
open("/dev/vc/7", O_RDWR|O_NONBLOCK) = -1 ENOENT (No such file or directory)
open("/dev/tty7", O_RDWR|O_NONBLOCK) = -1 EIO (Input/output error)
write(2, "\nFatal server error:\n", 21) = 21
A similar error can be seen at shutdown, complains about the tty error
and the halt process hangs up.
Unfortunately it's hard to bisect since Aug 11 and Aug 12 trees don't
boot, and Aug 8 tree has a problem regarding cred...
thanks,
Takashi
^ permalink raw reply [flat|nested] 10+ messages in thread
* linux-next: Tree for August 13
@ 2008-08-13 7:24 Stephen Rothwell
2008-08-13 11:05 ` Takashi Iwai
0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2008-08-13 7:24 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7120 bytes --]
Hi all,
Changes since next-20080812:
The ide tree lost its build fix patch.
The slab tree gained a conflict against linus' tree.
The kmemcheck tree gained 3 conflicts against the slab tree.
The ttydev tree lost a conflict.
I remerged Linus' tree at the end to reduce the size of the patches
(since -rc3 had been released).
I have also applied the following patches for known problems:
Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
xen-balloon: fix up sysfs issues
ath9k: work around gcc ICE again
usb: fix up use of usb_dbg
----------------------------------------------------------------------------
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 108 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
CONFLICT (content): Merge conflict in drivers/watchdog/at91rm9200_wdt.c
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
CONFLICT (content): Merge conflict in drivers/usb/gadget/omap_udc.c
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging dwmw2/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/genapic_64.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
Applying x86: export is_uv_system
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
Merging sh/master
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
Applying acpi: missing status declaration in acer-wmi.c
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
Merging ocfs2/linux-next
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging sparc/master
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/nfsd/export.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_export.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_iops.c
Merging sound/for-next
Merging arm/devel
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
Merging bkl-removal/bkl-removal
Merging trivial/next
CONFLICT (content): Merge conflict in Documentation/edac.txt
CONFLICT (content): Merge conflict in include/linux/securebits.h
Merging ubifs/linux-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.
Created commit 695543a: Revert "UBIFS: add NFS support"
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig
CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging m68knommu/for-next
Merging uclinux/for-next
Merging md/for-next
Merging cris/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
Merging generic-ipi/auto-generic-ipi-next
Merging mips/mips-for-linux-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/reg-for-linus
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/usb/class/cdc-acm.c
Merging agp/agp-next
Merging creds/next-creds
CONFLICT (content): Merge conflict in fs/namespace.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_acl.c
Merging master_tmp
Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
Applying xen-balloon: fix up sysfs issues
Applying ath9k: work around gcc ICE again
Applying usb: fix up use of usb_dbg
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-08-14 2:48 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-13 3:13 linux-next: Tree for August 13 Stephen Rothwell
2010-08-14 2:47 ` linux-next: Tree for August 13 (ceph) Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2009-08-13 10:05 linux-next: Tree for August 13 Stephen Rothwell
2008-08-13 7:24 Stephen Rothwell
2008-08-13 11:05 ` Takashi Iwai
2008-08-13 11:42 ` Stephen Rothwell
2008-08-13 13:08 ` Alan Cox
2008-08-13 13:37 ` Takashi Iwai
2008-08-13 14:40 ` Takashi Iwai
2008-08-14 9:57 ` Takashi Iwai
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).