linux-next: manual merge of the bkl-config tree with Linus' tree

linux-next: manual merge of the bkl-config tree with Linus' tree

[Stephen Rothwell]

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

Hi Arnd,

Today's linux-next merge of the bkl-config tree got a conflict in
arch/powerpc/kernel/setup_64.c between commit
0f6b77ca12bea571e0a97b0588f62aa5f6012d61 ("powerpc: Update a BKL related
comment") from Linus' tree and commit
bb2d384ab8184eb7f7146897e47fa5b38583112c ("BKL: remove references to
lock_kernel from comments") from the bkl-config tree.

I just used the former version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the bkl-config tree with Linus' tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the bkl-config tree got a conflict in
include/linux/smp_lock.h between commit
7957f0a857754c555e07f58a3fb83ac29501478c ("Fix build failure due to
hwirq.h needing smp_lock.h") from Linus' tree and commit
69baedf9d18ea86cc3b9916f5eeac9d089d3a117 ("BKL: mark lock_kernel as
deprecated") from the bkl-config tree.

Just context changes.  If fixed it up (see below) and can carry the fix
for as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/smp_lock.h
index 3a19882,9590a0c..0000000
--- a/include/linux/smp_lock.h
+++ b/include/linux/smp_lock.h
@@@ -55,7 -47,7 +45,6 @@@ __releases(kernel_lock)
  #ifdef CONFIG_BKL /* provoke build bug if not set */
  #define lock_kernel()
  #define unlock_kernel()
- #define cycle_kernel_lock()			do { } while(0)
 -#define kernel_locked()				1
  #endif /* CONFIG_BKL */
  
  #define release_kernel_lock(task)		do { } while(0)