Al Viro
705962ccc9
fix deadlock in loop.c ...
... doh
Jeremy Fitzhardinge noted that the recent loop.c cleanups worked, but
cause lockdep to complain.
Ouch. OK, the deadlock is real and yes, I'm an idiot. Speaking of which,
we probably want to s/lock/pin/ in drivers/base/map.c to avoid such
brainos again. And yes, this stuff needs clear documentation. Will try
to put one together once I get some sleep...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-13 09:44:05 -07:00
Pull misc-for-upstream into release branch
2007-05-10 04:06:12 -04:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2007-05-12 18:11:33 -07:00
Use menuconfig objects II - netdev/atm
2007-05-11 17:53:21 -04:00
[S390] Kconfig: refine depends statements.
2007-05-10 15:46:07 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
2007-05-09 12:54:17 -07:00
fix deadlock in loop.c
2007-05-13 09:44:05 -07:00
[Bluetooth] Fix unintentional fall-through in HCI line discipline
2007-05-10 23:45:06 -07:00
mm: remove destroy_dirty_buffers from invalidate_bdev()
2007-05-07 12:12:55 -07:00
IPMI: Add PPC openfirmware unregister
2007-05-12 10:55:40 -07:00
Add suspend-related notifications for CPU hotplug
2007-05-09 12:30:56 -07:00
[S390] Kconfig: use common Kconfig files for s390.
2007-05-10 15:46:08 +02:00
[S390] Kconfig: unwanted menus for s390.
2007-05-10 15:46:07 +02:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
virtual_eisa_root_init() should be __init
2007-05-08 11:15:02 -07:00
firewire: Convert OHCI driver to use standard goto unwinding for error handling.
2007-05-10 18:24:14 +02:00
remove "struct subsystem" as it is no longer needed
2007-05-02 18:57:59 -07:00
USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release()
2007-05-10 08:45:56 +02:00
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
2007-05-10 11:50:51 -07:00
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
2007-05-10 11:50:51 -07:00
[ARM] ecard: add ecardm_iomap() / ecardm_iounmap()
2007-05-11 17:19:02 +01:00
Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2007-05-10 13:30:08 -07:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
Input: evdev - fix overflow in compat_ioctl
2007-05-11 09:08:04 -07:00
[S390] Kconfig: unwanted menus for s390.
2007-05-10 15:46:07 +02:00
[S390] Kconfig: refine depends statements.
2007-05-10 15:46:07 +02:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
2007-05-09 15:41:31 -07:00
mca: add integrated device bus matching
2007-05-09 12:30:49 -07:00
md: improve the is_mddev_idle test
2007-05-11 08:29:37 -07:00
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
2007-05-11 12:57:16 -07:00
[S390] Kconfig: refine depends statements.
2007-05-10 15:46:07 +02:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
Pull misc-for-upstream into release branch
2007-05-10 04:06:12 -04:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2007-05-12 18:11:33 -07:00
header cleaning: don't include smp_lock.h when not used
2007-05-08 11:15:07 -07:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
2007-05-11 16:03:03 -07:00
fix hotplug for legacy platform drivers
2007-05-08 11:15:10 -07:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
Merge branch 'linux-2.6'
2007-05-08 13:37:51 +10:00
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
2007-05-11 09:59:50 -07:00
[S390] Kconfig: use common Kconfig files for s390.
2007-05-10 15:46:08 +02:00
[SPARC64]: envctrl.c needs asm/io.h
2007-05-11 21:39:25 -07:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2007-05-12 18:11:33 -07:00
[ARM] 4332/2: KS8695: Serial driver
2007-05-11 22:02:52 +01:00
MPC52xx PSC SPI master driver
2007-05-11 08:29:35 -07:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
[ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors.
2007-05-11 21:07:54 +01:00
pm3fb: Fix compile error if module
2007-05-12 09:47:15 -07:00
[S390] Kconfig: menus with depends on HAS_IOMEM.
2007-05-10 15:46:07 +02:00
Amiga Zorro bus: kill resource_size_t warnings
2007-05-04 17:59:08 -07:00
Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2007-05-10 13:30:08 -07:00
705962ccc9