From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the bkl-config tree with Linus' tree
Date: Thu, 18 Nov 2010 12:46:37 +1100 [thread overview]
Message-ID: <20101118124637.15571689.sfr@canb.auug.org.au> (raw)
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)
next reply other threads:[~2010-11-18 1:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-18 1:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-11-19 2:05 linux-next: manual merge of the bkl-config tree with Linus' tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101118124637.15571689.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox