Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f74b9444 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 

* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  BKL: That's all, folks
  fs/locks.c: Remove stale FIXME left over from BKL conversion
  ipx: remove the BKL
  appletalk: remove the BKL
  x25: remove the BKL
  ufs: remove the BKL
  hpfs: remove the BKL
  drivers: remove extraneous includes of smp_lock.h
  tracing: don't trace the BKL
  adfs: remove the big kernel lock
parents 7a636280 4ba8216c

drivers/net/appletalk/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#

config ATALK

	tristate "Appletalk protocol support"

	depends on BKL # waiting to be removed from net/appletalk/ddp.c

	select LLC

	---help---

	  AppleTalk is the protocol that Apple computers can use to communicate

drivers/scsi/megaraid/megaraid_sas_fp.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <linux/spinlock.h>

#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/smp_lock.h>

#include <linux/uio.h>

#include <linux/uaccess.h>

#include <linux/fs.h>

drivers/scsi/megaraid/megaraid_sas_fusion.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/spinlock.h>

#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/smp_lock.h>

#include <linux/uio.h>

#include <linux/uaccess.h>

#include <linux/fs.h>

drivers/staging/easycap/easycap_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
*/

/*****************************************************************************/



#include <linux/smp_lock.h>

#include "easycap.h"



/*--------------------------------------------------------------------------*/

drivers/target/target_core_device.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/timer.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/smp_lock.h>

#include <linux/kthread.h>

#include <linux/in.h>

#include <net/sock.h>