linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for June 21
@ 2010-06-21  7:00 Stephen Rothwell
  2010-06-21 16:00 ` linux-next: Tree for June 21 (staging/easycap) Randy Dunlap
  2010-06-22  5:25 ` -next June 21: WARNING: at include/linux/tty.h Sachin Sant
  0 siblings, 2 replies; 9+ messages in thread
From: Stephen Rothwell @ 2010-06-21  7:00 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 8357 bytes --]

Hi all,

Changes since 20100618:

My fixes tree contains:
      v4l-dvb: update gfp/slab.h includes
      arm: update gfp/slab.h includes
      davinci: update gfp/slab.h includes
      ocfs2: update gfp/slab.h includes
      acpi: update gfp/slab.h includes

The i2c tree gained a build failure so I used the version from
next-20100618.

The tip tree gained conflicts against the block and net trees.

----------------------------------------------------------------------------

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 164 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/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 gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging tegra/for-next
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
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
Merging sparc/master
Merging tile/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
CONFLICT (content): Merge conflict in fs/ecryptfs/main.c
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
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
$ git reset --hard HEAD^
Merging refs/next/20100618/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging swiotlb/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
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
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_combios.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/rv770.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
Applying: fsnotify: update gfp/slab.h includes
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
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in net/bridge/br_fdb.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_redirect.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_ulog.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebtables.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_log.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_queue.c
Applying: net: merge fixups for bridge rcu code
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
CONFLICT (content): Merge conflict in mm/memory-failure.c
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/master

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: Tree for June 21 (staging/easycap)
  2010-06-21  7:00 linux-next: Tree for June 21 Stephen Rothwell
@ 2010-06-21 16:00 ` Randy Dunlap
  2010-06-22 22:36   ` Greg KH
  2010-06-22  5:25 ` -next June 21: WARNING: at include/linux/tty.h Sachin Sant
  1 sibling, 1 reply; 9+ messages in thread
From: Randy Dunlap @ 2010-06-21 16:00 UTC (permalink / raw)
  To: Stephen Rothwell, gregkh, devel; +Cc: linux-next, LKML

On Mon, 21 Jun 2010 17:00:56 +1000 Stephen Rothwell wrote:

> Hi all,
> 
> Changes since 20100618:


When CONFIG_USB is not enabled:

ERROR: "usb_kill_urb" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_deregister_dev" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_set_interface" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_register_dev" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_control_msg" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_get_dev" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_find_interface" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/easycap/easycap.ko] undefined!


Adding "depends on USB" to EASYCAP is a good start.
After that and enabling CONFIG_USB, build of easycap gets:

ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!

because there is no media/video support enabled.  Also no SOUND enabled,
so I expect there to be build errors associated with sound also, meaning that
the Kconfig file should probably modified with something like

config EASYCAP
+	depends on USB && VIDEO_DEV && SND


This is something that the driver author should know the answer to and submit a
patch for.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

^ permalink raw reply	[flat|nested] 9+ messages in thread

* -next June 21: WARNING: at include/linux/tty.h
  2010-06-21  7:00 linux-next: Tree for June 21 Stephen Rothwell
  2010-06-21 16:00 ` linux-next: Tree for June 21 (staging/easycap) Randy Dunlap
@ 2010-06-22  5:25 ` Sachin Sant
  2010-06-23  6:55   ` Stephen Rothwell
  1 sibling, 1 reply; 9+ messages in thread
From: Sachin Sant @ 2010-06-22  5:25 UTC (permalink / raw)
  To: linux-next; +Cc: LKML, arnd, Alan Cox

With next-20100621 on a x86_64 box came across this warning :

TCP cubic registered
registered taskstats version 1
------------[ cut here ]------------
WARNING: at include/linux/tty.h:589 tty_open+0x76/0x57a()
Hardware name: BladeCenter LS21 -[79716AA]-
Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.35-rc3-autotest-next-20100621 #1
Call Trace:
 [<ffffffff812428d8>] ? tty_open+0x76/0x57a
 [<ffffffff8103cf39>] warn_slowpath_common+0x80/0xae
 [<ffffffff8103cf7c>] warn_slowpath_null+0x15/0x17
 [<ffffffff812428d8>] tty_open+0x76/0x57a
 [<ffffffff810d4544>] ? exact_match+0x0/0x9
 [<ffffffff810d491f>] chrdev_open+0x133/0x152
 [<ffffffff810d47ec>] ? chrdev_open+0x0/0x152
 [<ffffffff810d07b4>] __dentry_open+0x140/0x252
 [<ffffffff810d0990>] nameidata_to_filp+0x3e/0x4f
 [<ffffffff810db588>] do_last+0x51a/0x643
 [<ffffffff810dd621>] do_filp_open+0x23d/0x5f8
 [<ffffffff810c1ba8>] ? slab_node+0x3c/0x78
 [<ffffffff810d05a1>] do_sys_open+0x5a/0xf0
 [<ffffffff810d0660>] sys_open+0x1b/0x1d
 [<ffffffff818e66fc>] kernel_init+0x1b3/0x220
 [<ffffffff810036d4>] kernel_thread_helper+0x4/0x10
 [<ffffffff818e6549>] ? kernel_init+0x0/0x220
 [<ffffffff810036d0>] ? kernel_thread_helper+0x0/0x10
---[ end trace 108cb769a1c0e534 ]---

This warning seem to have been introduced with next-20100617.
The corresponding code is :

585 static inline void tty_lock(void) __acquires(kernel_lock)
586 {
587 #ifdef CONFIG_LOCK_KERNEL
588         /* kernel_locked is 1 for !CONFIG_LOCK_KERNEL */
589         WARN_ON(kernel_locked());
590 #endif
591         lock_kernel();
592 }

which was added by commit 01510c869f9..

tty: replace BKL with a new tty_lock

Thanks
-Sachin


-- 

---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: Tree for June 21 (staging/easycap)
  2010-06-21 16:00 ` linux-next: Tree for June 21 (staging/easycap) Randy Dunlap
@ 2010-06-22 22:36   ` Greg KH
  2010-06-23 18:06     ` Randy Dunlap
  0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2010-06-22 22:36 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Stephen Rothwell, gregkh, devel, linux-next, LKML

On Mon, Jun 21, 2010 at 09:00:49AM -0700, Randy Dunlap wrote:
> On Mon, 21 Jun 2010 17:00:56 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20100618:
> 
> 
> When CONFIG_USB is not enabled:
> 
> ERROR: "usb_kill_urb" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_deregister_dev" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_deregister" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_set_interface" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_register_dev" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_control_msg" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_submit_urb" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_get_dev" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_find_interface" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_register_driver" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_free_urb" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "usb_alloc_urb" [drivers/staging/easycap/easycap.ko] undefined!
> 
> 
> Adding "depends on USB" to EASYCAP is a good start.
> After that and enabling CONFIG_USB, build of easycap gets:
> 
> ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
> ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!
> 
> because there is no media/video support enabled.  Also no SOUND enabled,
> so I expect there to be build errors associated with sound also, meaning that
> the Kconfig file should probably modified with something like
> 
> config EASYCAP
> +	depends on USB && VIDEO_DEV && SND
> 
> 
> This is something that the driver author should know the answer to and submit a
> patch for.

You are right, care to make up a patch for this?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: -next June 21: WARNING: at include/linux/tty.h
  2010-06-22  5:25 ` -next June 21: WARNING: at include/linux/tty.h Sachin Sant
@ 2010-06-23  6:55   ` Stephen Rothwell
  2010-06-23  7:32     ` Arnd Bergmann
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2010-06-23  6:55 UTC (permalink / raw)
  To: Sachin Sant; +Cc: linux-next, LKML, arnd, Alan Cox

[-- Attachment #1: Type: text/plain, Size: 3811 bytes --]

On Tue, 22 Jun 2010 10:55:54 +0530 Sachin Sant <sachinp@in.ibm.com> wrote:
>
> With next-20100621 on a x86_64 box came across this warning :
> 
> TCP cubic registered
> registered taskstats version 1
> ------------[ cut here ]------------
> WARNING: at include/linux/tty.h:589 tty_open+0x76/0x57a()
> Hardware name: BladeCenter LS21 -[79716AA]-
> Modules linked in:
> Pid: 1, comm: swapper Not tainted 2.6.35-rc3-autotest-next-20100621 #1
> Call Trace:
>  [<ffffffff812428d8>] ? tty_open+0x76/0x57a
>  [<ffffffff8103cf39>] warn_slowpath_common+0x80/0xae
>  [<ffffffff8103cf7c>] warn_slowpath_null+0x15/0x17
>  [<ffffffff812428d8>] tty_open+0x76/0x57a
>  [<ffffffff810d4544>] ? exact_match+0x0/0x9
>  [<ffffffff810d491f>] chrdev_open+0x133/0x152
>  [<ffffffff810d47ec>] ? chrdev_open+0x0/0x152
>  [<ffffffff810d07b4>] __dentry_open+0x140/0x252
>  [<ffffffff810d0990>] nameidata_to_filp+0x3e/0x4f
>  [<ffffffff810db588>] do_last+0x51a/0x643
>  [<ffffffff810dd621>] do_filp_open+0x23d/0x5f8
>  [<ffffffff810c1ba8>] ? slab_node+0x3c/0x78
>  [<ffffffff810d05a1>] do_sys_open+0x5a/0xf0
>  [<ffffffff810d0660>] sys_open+0x1b/0x1d
>  [<ffffffff818e66fc>] kernel_init+0x1b3/0x220
>  [<ffffffff810036d4>] kernel_thread_helper+0x4/0x10
>  [<ffffffff818e6549>] ? kernel_init+0x0/0x220
>  [<ffffffff810036d0>] ? kernel_thread_helper+0x0/0x10
> ---[ end trace 108cb769a1c0e534 ]---
> 
> This warning seem to have been introduced with next-20100617.
> The corresponding code is :
> 
> 585 static inline void tty_lock(void) __acquires(kernel_lock)
> 586 {
> 587 #ifdef CONFIG_LOCK_KERNEL
> 588         /* kernel_locked is 1 for !CONFIG_LOCK_KERNEL */
> 589         WARN_ON(kernel_locked());
> 590 #endif
> 591         lock_kernel();
> 592 }
> 
> which was added by commit 01510c869f9..
> 
> tty: replace BKL with a new tty_lock

I am getting a similar (the same) warning on a Power7 box I boot test:

Badness at include/linux/tty.h:589
NIP: c000000000339244 LR: c00000000033922c CTR: c000000000339178
REGS: c0000007a606f690 TRAP: 0700   Not tainted  (2.6.35-rc3-autokern1-next-20100623)
MSR: 8000000000029032 <EE,ME,CE,IR,DR>  CR: 24244022  XER: 20000010
TASK = c000000f970d8000[1] 'swapper' THREAD: c0000007a606c000 CPU: 0
GPR00: 0000000000000001 c0000007a606f910 c0000000009a1450 c0000000009105f0 
GPR04: c0000007a585f200 c000000000a6e588 0000000000000000 c000000f9a002800 
GPR08: 0000000000000017 c000000f970d8000 00000000007fffff c0000000003397c8 
GPR12: 0000000024222028 c000000001fc3000 0000000000000000 ffffffffffffff9c 
GPR16: 0000000002d80000 0000000000000000 c0000007a606fcd0 0000000000010002 
GPR20: c0000000009105f0 ffffffffffffffff c0000007a606f980 fffffffffffff000 
GPR24: c0000007a9028648 0000000000040001 0000000000000000 0000000000500001 
GPR28: c0000007a585f200 c000000000a6e588 c00000000093fd68 0000000000000000 
NIP [c000000000339244] .tty_open+0xcc/0x650
LR [c00000000033922c] .tty_open+0xb4/0x650
Call Trace:
[c0000007a606f910] [c00000000033922c] .tty_open+0xb4/0x650 (unreliable)
[c0000007a606fa10] [c00000000013eb20] .chrdev_open+0x230/0x278
[c0000007a606fad0] [c000000000138bc8] .__dentry_open+0x1e8/0x35c
[c0000007a606fb90] [c000000000148580] .do_last+0x5bc/0x764
[c0000007a606fc50] [c00000000014a8c8] .do_filp_open+0x26c/0x734
[c0000007a606fe30] [c0000000001388e4] .do_sys_open+0x84/0x154
[c0000007a606fee0] [c00000000083d4f8] .kernel_init+0x288/0x324
[c0000007a606ff90] [c0000000000261e0] .kernel_thread+0x54/0x70
Instruction dump:
60000001 7d1b0000 835c0038 7e83a378 92a10070 48264a25 60000000 575a05ee 
e92d01b0 8009001c 7c0000f8 54000ffe <0b000000> ea5e80b0 ea3e80a8 38a0024f 

I get this twice for each boot.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: -next June 21: WARNING: at include/linux/tty.h
  2010-06-23  6:55   ` Stephen Rothwell
@ 2010-06-23  7:32     ` Arnd Bergmann
  0 siblings, 0 replies; 9+ messages in thread
From: Arnd Bergmann @ 2010-06-23  7:32 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Sachin Sant, linux-next, LKML, Alan Cox

On Wednesday 23 June 2010 08:55:57 Stephen Rothwell wrote:
> On Tue, 22 Jun 2010 10:55:54 +0530 Sachin Sant <sachinp@in.ibm.com> wrote:
> >
> > With next-20100621 on a x86_64 box came across this warning :
> > 
> > TCP cubic registered
> > registered taskstats version 1
> > ------------[ cut here ]------------
> > WARNING: at include/linux/tty.h:589 tty_open+0x76/0x57a()
>
> I get this twice for each boot.

Tony Luck also reported this, it's harmless and gets fixed 
by the patch below, which belongs to another series. 
There are still a few dependencies between the other
BKL removal series, which I try to minimize and then
I'll ask you to add those to -next.

---

I have shown by code review that no driver takes
the BKL at init time any more, so whatever the
init code was locking against is no longer there
and it is now safe to remove the BKL there.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/init/main.c b/init/main.c
index 3bdb152..81821e1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -434,7 +434,6 @@ static noinline void __init_refok rest_init(void)
 	rcu_read_lock();
 	kthreadd_task = find_task_by_pid_ns(pid, &init_pid_ns);
 	rcu_read_unlock();
-	unlock_kernel();
 
 	/*
 	 * The boot idle thread must execute schedule()
@@ -555,7 +554,6 @@ asmlinkage void __init start_kernel(void)
  * Interrupts are still disabled. Do necessary setups, then
  * enable them
  */
-	lock_kernel();
 	tick_init();
 	boot_cpu_init();
 	page_address_init();
@@ -819,7 +817,6 @@ static noinline int init_post(void)
 	/* need to finish all async __init code before freeing the memory */
 	async_synchronize_full();
 	free_initmem();
-	unlock_kernel();
 	mark_rodata_ro();
 	system_state = SYSTEM_RUNNING;
 	numa_default_policy();
@@ -855,8 +852,6 @@ static noinline int init_post(void)
 
 static int __init kernel_init(void * unused)
 {
-	lock_kernel();
-
 	/*
 	 * init can allocate pages on any node
 	 */
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 086d363..8047ca5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -734,13 +734,6 @@ __acquires(kernel_lock)
 		return -1;
 	}
 
-	/*
-	 * When this gets called we hold the BKL which means that
-	 * preemption is disabled. Various trace selftests however
-	 * need to disable and enable preemption for successful tests.
-	 * So we drop the BKL here and grab it after the tests again.
-	 */
-	unlock_kernel();
 	mutex_lock(&trace_types_lock);
 
 	tracing_selftest_running = true;
@@ -822,7 +815,6 @@ __acquires(kernel_lock)
 #endif
 
  out_unlock:
-	lock_kernel();
 	return ret;
 }
 

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: linux-next: Tree for June 21 (staging/easycap)
  2010-06-22 22:36   ` Greg KH
@ 2010-06-23 18:06     ` Randy Dunlap
  2010-06-23 22:09       ` Greg KH
  0 siblings, 1 reply; 9+ messages in thread
From: Randy Dunlap @ 2010-06-23 18:06 UTC (permalink / raw)
  To: Greg KH; +Cc: Stephen Rothwell, gregkh, devel, linux-next, LKML

Greg KH wrote:
> On Mon, Jun 21, 2010 at 09:00:49AM -0700, Randy Dunlap wrote:
>> On Mon, 21 Jun 2010 17:00:56 +1000 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20100618:
>>
>> When CONFIG_USB is not enabled:
>>
>> ERROR: "usb_kill_urb" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_deregister_dev" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_deregister" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_set_interface" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_register_dev" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_control_msg" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_submit_urb" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_get_dev" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_find_interface" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_register_driver" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_free_urb" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "usb_alloc_urb" [drivers/staging/easycap/easycap.ko] undefined!
>>
>>
>> Adding "depends on USB" to EASYCAP is a good start.
>> After that and enabling CONFIG_USB, build of easycap gets:
>>
>> ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
>> ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!
>>
>> because there is no media/video support enabled.  Also no SOUND enabled,
>> so I expect there to be build errors associated with sound also, meaning that
>> the Kconfig file should probably modified with something like
>>
>> config EASYCAP
>> +	depends on USB && VIDEO_DEV && SND
>>
>>
>> This is something that the driver author should know the answer to and submit a
>> patch for.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

> 
> You are right, care to make up a patch for this?

No thanks, please see my last statement above.
IOW, I want the driver developer (not you) to act responsibly on this.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: Tree for June 21 (staging/easycap)
  2010-06-23 18:06     ` Randy Dunlap
@ 2010-06-23 22:09       ` Greg KH
  0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2010-06-23 22:09 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Stephen Rothwell, gregkh, devel, linux-next, LKML

On Wed, Jun 23, 2010 at 11:06:30AM -0700, Randy Dunlap wrote:
> Greg KH wrote:
> > On Mon, Jun 21, 2010 at 09:00:49AM -0700, Randy Dunlap wrote:
> >> On Mon, 21 Jun 2010 17:00:56 +1000 Stephen Rothwell wrote:
> >>
> >>> Hi all,
> >>>
> >>> Changes since 20100618:
> >>
> >> When CONFIG_USB is not enabled:
> >>
> >> ERROR: "usb_kill_urb" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_deregister_dev" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_deregister" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_set_interface" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_register_dev" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_control_msg" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_submit_urb" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_get_dev" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_find_interface" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_register_driver" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_free_urb" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "usb_alloc_urb" [drivers/staging/easycap/easycap.ko] undefined!
> >>
> >>
> >> Adding "depends on USB" to EASYCAP is a good start.
> >> After that and enabling CONFIG_USB, build of easycap gets:
> >>
> >> ERROR: "video_register_device" [drivers/staging/easycap/easycap.ko] undefined!
> >> ERROR: "video_unregister_device" [drivers/staging/easycap/easycap.ko] undefined!
> >>
> >> because there is no media/video support enabled.  Also no SOUND enabled,
> >> so I expect there to be build errors associated with sound also, meaning that
> >> the Kconfig file should probably modified with something like
> >>
> >> config EASYCAP
> >> +	depends on USB && VIDEO_DEV && SND
> >>
> >>
> >> This is something that the driver author should know the answer to and submit a
> >> patch for.
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 
> > 
> > You are right, care to make up a patch for this?
> 
> No thanks, please see my last statement above.
> IOW, I want the driver developer (not you) to act responsibly on this.

Ok, I'm working with them right now on this.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: Tree for June 21
@ 2011-06-21  5:56 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2011-06-21  5:56 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 10422 bytes --]

Hi all,

Changes since 20110620:

Undropped tree: rcu

The powerpc allyesconfig (and probably others) is still broken because we
now build the staging drivers and because of a commit in Linus' tree.

The xilinx tree lost its conflicts.

The net tree lost its build failure.

The wireless tree gained a conflict against the wireless-current tree.

The bluetooth tree gained a conflict against the wireless-current tree.

The mmc tree lost its build failure.

The mfd tree gained a build failure so I used the version from
next-20110620.

The trivial tree gained a conflict against the s390 tree.

The rcu tree lost its conflicts.

The staging tree gained conflicts against the trivial and net trees.

----------------------------------------------------------------------------

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 194 trees (counting Linus' and 28 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 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 kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/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 driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
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 sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/mm/context.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
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/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
CONFLICT (content): Merge conflict in fs/ceph/export.c
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging of-pci/of-pci
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging slave-dma/next
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_core.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging mtd/master
Merging l2-mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/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
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
$ git rm -f drivers/mmc/host/sdhci-of-core.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
$ git reset --hard HEAD^
Merging refs/next/20110620/mfd
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree.
CONFLICT (delete/modify): arch/s390/kvm/sie64a.S deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/s390/kvm/sie64a.S left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
$ git rm -f arch/arm/mach-ep93xx/dma-m2p.c
$ git rm -f arch/s390/kvm/sie64a.S
Merging audit/for-next
Merging suspend/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c
Merging tip/auto-latest
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/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 namespace/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c
CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-06-21  5:56 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-21  7:00 linux-next: Tree for June 21 Stephen Rothwell
2010-06-21 16:00 ` linux-next: Tree for June 21 (staging/easycap) Randy Dunlap
2010-06-22 22:36   ` Greg KH
2010-06-23 18:06     ` Randy Dunlap
2010-06-23 22:09       ` Greg KH
2010-06-22  5:25 ` -next June 21: WARNING: at include/linux/tty.h Sachin Sant
2010-06-23  6:55   ` Stephen Rothwell
2010-06-23  7:32     ` Arnd Bergmann
2011-06-21  5:56 linux-next: Tree for June 21 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).