* linux-next: manual merge of the bkl-config tree with the tty tree
@ 2011-02-28 6:40 Stephen Rothwell
2011-03-01 22:24 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-02-28 6:40 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Greg KH
Hi Arnd,
Today's linux-next merge of the bkl-config tree got a conflict in
drivers/staging/Kconfig between commits
4a6514e6d096716fb7bedf238efaaca877e2a7e8 ("tty: move obsolete and broken
tty drivers to drivers/staging/tty/") and
4c37705877e74c02c968735c2eee0f84914cf557 ("tty: move obsolete and broken
generic_serial drivers to drivers/staging/generic_serial/") from the tty
tree and commit a3ba01b63468c925518da2da0ac3be11358f60cb ("BKL: move
CONFIG_BKL to staging") from the bkl-config tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/Kconfig
index fc751e3,5adf537..0000000
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -41,10 -41,17 +41,21 @@@ config STAGING_EXCLUDE_BUIL
if !STAGING_EXCLUDE_BUILD
+ config BKL
+ bool "Include drivers that depend on the Big Kernel Lock" if (SMP || PREEMPT)
+ default !(SMP || PREEMPT)
+ help
+ This is the traditional lock that is used in old code instead
+ of proper locking. All drivers that use the BKL should depend
+ on this symbol.
+ A small number of drivers still require this. All drivers that
+ use the BKL should be changed to a better serialisation method
+ or they will be removed in 2.6.39.
+
+source "drivers/staging/tty/Kconfig"
+
+source "drivers/staging/generic_serial/Kconfig"
+
source "drivers/staging/et131x/Kconfig"
source "drivers/staging/slicoss/Kconfig"
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the bkl-config tree with the tty tree
2011-02-28 6:40 linux-next: manual merge of the bkl-config tree with the tty tree Stephen Rothwell
@ 2011-03-01 22:24 ` Arnd Bergmann
2011-03-01 23:13 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2011-03-01 22:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg KH
Hi Stephen,
On Monday 28 February 2011 07:40:07 Stephen Rothwell wrote:
> Today's linux-next merge of the bkl-config tree got a conflict in
> drivers/staging/Kconfig between commits
> 4a6514e6d096716fb7bedf238efaaca877e2a7e8 ("tty: move obsolete and broken
> tty drivers to drivers/staging/tty/") and
> 4c37705877e74c02c968735c2eee0f84914cf557 ("tty: move obsolete and broken
> generic_serial drivers to drivers/staging/generic_serial/") from the tty
> tree and commit a3ba01b63468c925518da2da0ac3be11358f60cb ("BKL: move
> CONFIG_BKL to staging") from the bkl-config tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
I have cleared the branch in my repository now, since the contents
were very outdated. I have a newer branch named 'final' with all the patches
that are needed on top of -next to kill the BKL for good.
I'll send the patches out for review again and if everyone is happy,
I can update the config branch so they get into -next.
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the bkl-config tree with the tty tree
2011-03-01 22:24 ` Arnd Bergmann
@ 2011-03-01 23:13 ` Stephen Rothwell
2011-03-01 23:16 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-03-01 23:13 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Greg KH
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
Hi Arnd,
On Tue, 1 Mar 2011 23:24:27 +0100 Arnd Bergmann <arnd@arndb.de> wrote:
>
> I have cleared the branch in my repository now, since the contents
> were very outdated. I have a newer branch named 'final' with all the patches
> that are needed on top of -next to kill the BKL for good.
Thanks for that.
> I'll send the patches out for review again and if everyone is happy,
> I can update the config branch so they get into -next.
So can I remove the bkl-trivial, bkl-llseek and bkl-vfs trees?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the bkl-config tree with the tty tree
2011-03-01 23:13 ` Stephen Rothwell
@ 2011-03-01 23:16 ` Arnd Bergmann
2011-03-01 23:24 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2011-03-01 23:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg KH
On Wednesday 02 March 2011 00:13:57 Stephen Rothwell wrote:
> On Tue, 1 Mar 2011 23:24:27 +0100 Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > I have cleared the branch in my repository now, since the contents
> > were very outdated. I have a newer branch named 'final' with all the patches
> > that are needed on top of -next to kill the BKL for good.
>
> Thanks for that.
>
> > I'll send the patches out for review again and if everyone is happy,
> > I can update the config branch so they get into -next.
Small update: I've added part of the series to the config branch
already, just the patches that already have Acked-by:s from the
maintainers, but no other tree to go through.
> So can I remove the bkl-trivial, bkl-llseek and bkl-vfs trees?
Yes.
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-01 23:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-28 6:40 linux-next: manual merge of the bkl-config tree with the tty tree Stephen Rothwell
2011-03-01 22:24 ` Arnd Bergmann
2011-03-01 23:13 ` Stephen Rothwell
2011-03-01 23:16 ` Arnd Bergmann
2011-03-01 23:24 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox