From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Jul 2008 21:48:31 +0000 (-0700)
Subject: Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
X-Git-Tag: v2.6.27-rc1~1103
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1794f2c5b5817eb79ccc5e00701ca748d1b073a;p=linux-2.6

Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

* 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits)
  IB/umad: BKL is not needed for ib_umad_open()
  IB/uverbs: BKL is not needed for ib_uverbs_open()
  bf561-coreb: BKL unneeded for open()
  Call fasync() functions without the BKL
  snd/PCM: fasync BKL pushdown
  ipmi: fasync BKL pushdown
  ecryptfs: fasync BKL pushdown
  Bluetooth VHCI: fasync BKL pushdown
  tty_io: fasync BKL pushdown
  tun: fasync BKL pushdown
  i2o: fasync BKL pushdown
  mpt: fasync BKL pushdown
  Remove BKL from remote_llseek v2
  Make FAT users happier by not deadlocking
  x86-mce: BKL pushdown
  vmwatchdog: BKL pushdown
  vmcp: BKL pushdown
  via-pmu: BKL pushdown
  uml-random: BKL pushdown
  uml-mmapper: BKL pushdown
  ...
---

d1794f2c5b5817eb79ccc5e00701ca748d1b073a
diff --cc drivers/pcmcia/pcmcia_ioctl.c
index afd00e7bbb,138396ef5b..419f97fc9a
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@@ -27,8 -27,10 +27,9 @@@
  #include <linux/proc_fs.h>
  #include <linux/poll.h>
  #include <linux/pci.h>
+ #include <linux/smp_lock.h>
  #include <linux/workqueue.h>
  
 -#define IN_CARD_SERVICES
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cs.h>
  #include <pcmcia/cistpl.h>
diff --cc drivers/s390/char/monreader.c
index f0e4c96afb,dc4710e64e..35fd8dfcaa
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@@ -326,7 -377,9 +328,8 @@@ static int mon_open(struct inode *inode
  		rc = -EIO;
  		goto out_path;
  	}
 -	P_INFO("open, established connection to *MONITOR service\n\n");
  	filp->private_data = monpriv;
+ 	unlock_kernel();
  	return nonseekable_open(inode, filp);
  
  out_path: