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@xxxxxxxxxxxxxxxx

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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/