* linux-next: manual merge of the bkl-removal tree
@ 2008-06-16 6:50 Stephen Rothwell
2008-06-19 20:51 ` Jonathan Corbet
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2008-06-16 6:50 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-next, Arnd Bergmann, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
Hi Jon,
Today's linux-next merge of the bkl-removal tree got conflicts in
kernel/power/user.c between commit
56ca8b0af290931c647e23876b75f9fd78cbaa82 ("snapshot: Use pm_mutex for
mutual exclusion") from the acpi tree and commit
478dfeabc7e4499fa1c5b009537433f75ef939d8 ("power-user: BKL pushdown")
from the blk-removal tree.
I used the version from the acpi tree. So it looks like the latter is no
longer needed.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the bkl-removal tree
2008-06-16 6:50 Stephen Rothwell
@ 2008-06-19 20:51 ` Jonathan Corbet
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Corbet @ 2008-06-19 20:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Arnd Bergmann, Rafael J. Wysocki
On Mon, 16 Jun 2008 16:50:51 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Jon,
>
> Today's linux-next merge of the bkl-removal tree got conflicts in
> kernel/power/user.c between commit
> 56ca8b0af290931c647e23876b75f9fd78cbaa82 ("snapshot: Use pm_mutex for
> mutual exclusion") from the acpi tree and commit
> 478dfeabc7e4499fa1c5b009537433f75ef939d8 ("power-user: BKL pushdown")
> from the blk-removal tree.
>
> I used the version from the acpi tree. So it looks like the latter
> is no longer needed.
>
>From my reading of the pm_mutex patch, it does seem to eliminate the
need to hold the BKL in the open() path. Unless somebody objects, I'll
be removing the pushdown patch from the bkl-removal tree.
Thanks,
jon
Jonathan Corbet / LWN.net / corbet@lwn•net
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the bkl-removal tree
@ 2008-06-30 8:21 Stephen Rothwell
2008-06-30 22:51 ` Jonathan Corbet
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2008-06-30 8:21 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-next, Andi Kleen, Chuck Lever, Trond Myklebust
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Hi Jonathan,
Today's linux-next merge of the bkl-removal tree got a trivial conflict
in fs/nfs/file.c between commit 69cc426fc4b7664ec69642cd9b30eabe2ec8ad4a
("NFS: Make nfs_llseek methods consistent") from the nfs tree and commit
a9f88f0c4fed5d1ed6fb4a0389891d327a147130 ("Remove BKL from remote_llseek
v2") from the bkl-removal tree.
I fixed it up and can carry it. Or maybe you should liaise with Trond to
put ths nfs part of the BKL removal in his tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the bkl-removal tree
2008-06-30 8:21 linux-next: manual merge of the bkl-removal tree Stephen Rothwell
@ 2008-06-30 22:51 ` Jonathan Corbet
2008-07-01 16:05 ` Chuck Lever
0 siblings, 1 reply; 8+ messages in thread
From: Jonathan Corbet @ 2008-06-30 22:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andi Kleen, Chuck Lever, Trond Myklebust
Hi Trond, Chuck,
On Mon, 30 Jun 2008 18:21:22 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Today's linux-next merge of the bkl-removal tree got a trivial
> conflict in fs/nfs/file.c between commit
> 69cc426fc4b7664ec69642cd9b30eabe2ec8ad4a ("NFS: Make nfs_llseek
> methods consistent") from the nfs tree and commit
> a9f88f0c4fed5d1ed6fb4a0389891d327a147130 ("Remove BKL from
> remote_llseek v2") from the bkl-removal tree.
>
> I fixed it up and can carry it. Or maybe you should liaise with
> Trond to put ths nfs part of the BKL removal in his tree.
So how would you like to handle this one? The patch from Andi which
conflicts with your tree can stand alone, but it affects a few files
outside of the NFS tree. Even so, it looks like having you snarf it
and merge it there might be the easiest way to make the pieces fit
together.
Thanks,
jon
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the bkl-removal tree
@ 2008-07-01 9:45 Stephen Rothwell
2008-07-02 21:10 ` Jonathan Corbet
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2008-07-01 9:45 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-next, Gerald Schaefer, Martin Schwidefsky
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Hi Jonathan,
Today's linux-next merge of the bkl-removal tree got a conflict in
drivers/s390/char/monreader.c between commit
4b45ec0706ac12bf0c790747e55b4f3fec776c7a ("[S390] Cleanup monreader
printk messages.") from the s390 tree and commit
167ae8a4822ed405037e72d660acf3294ab32807 ("monreader: BKL pushdown") from
the bkl-removal tree.
Just a matter of overlapping additions. I can carry it.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the bkl-removal tree
2008-06-30 22:51 ` Jonathan Corbet
@ 2008-07-01 16:05 ` Chuck Lever
0 siblings, 0 replies; 8+ messages in thread
From: Chuck Lever @ 2008-07-01 16:05 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: Stephen Rothwell, linux-next, Andi Kleen, Trond Myklebust
On Jun 30, 2008, at 6:51 PM, Jonathan Corbet wrote:
> Hi Trond, Chuck,
>
> On Mon, 30 Jun 2008 18:21:22 +1000
> Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
>> Today's linux-next merge of the bkl-removal tree got a trivial
>> conflict in fs/nfs/file.c between commit
>> 69cc426fc4b7664ec69642cd9b30eabe2ec8ad4a ("NFS: Make nfs_llseek
>> methods consistent") from the nfs tree and commit
>> a9f88f0c4fed5d1ed6fb4a0389891d327a147130 ("Remove BKL from
>> remote_llseek v2") from the bkl-removal tree.
>>
>> I fixed it up and can carry it. Or maybe you should liaise with
>> Trond to put ths nfs part of the BKL removal in his tree.
>
> So how would you like to handle this one? The patch from Andi which
> conflicts with your tree can stand alone, but it affects a few files
> outside of the NFS tree. Even so, it looks like having you snarf it
> and merge it there might be the easiest way to make the pieces fit
> together.
Whatever Trond decides is OK with me.
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the bkl-removal tree
2008-07-01 9:45 Stephen Rothwell
@ 2008-07-02 21:10 ` Jonathan Corbet
2008-07-03 5:39 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Jonathan Corbet @ 2008-07-02 21:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Gerald Schaefer, Martin Schwidefsky
On Tue, 1 Jul 2008 19:45:44 +1000
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Today's linux-next merge of the bkl-removal tree got a conflict in
> drivers/s390/char/monreader.c between commit
> 4b45ec0706ac12bf0c790747e55b4f3fec776c7a ("[S390] Cleanup monreader
> printk messages.") from the s390 tree and commit
> 167ae8a4822ed405037e72d660acf3294ab32807 ("monreader: BKL pushdown")
> from the bkl-removal tree.
That one's a simple matter of moving the include of
<linux/smp_lock.h>. I've done that, so this conflict should be gone
now.
Thanks,
jon
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the bkl-removal tree
2008-07-02 21:10 ` Jonathan Corbet
@ 2008-07-03 5:39 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2008-07-03 5:39 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: linux-next, Gerald Schaefer, Martin Schwidefsky
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
Hi Jon,
On Wed, 2 Jul 2008 15:10:21 -0600 Jonathan Corbet <corbet@lwn•net> wrote:
>
> On Tue, 1 Jul 2008 19:45:44 +1000
> Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> > Today's linux-next merge of the bkl-removal tree got a conflict in
> > drivers/s390/char/monreader.c between commit
> > 4b45ec0706ac12bf0c790747e55b4f3fec776c7a ("[S390] Cleanup monreader
> > printk messages.") from the s390 tree and commit
> > 167ae8a4822ed405037e72d660acf3294ab32807 ("monreader: BKL pushdown")
> > from the bkl-removal tree.
>
> That one's a simple matter of moving the include of
> <linux/smp_lock.h>. I've done that, so this conflict should be gone
> now.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-07-03 5:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-30 8:21 linux-next: manual merge of the bkl-removal tree Stephen Rothwell
2008-06-30 22:51 ` Jonathan Corbet
2008-07-01 16:05 ` Chuck Lever
-- strict thread matches above, loose matches on Subject: below --
2008-07-01 9:45 Stephen Rothwell
2008-07-02 21:10 ` Jonathan Corbet
2008-07-03 5:39 ` Stephen Rothwell
2008-06-16 6:50 Stephen Rothwell
2008-06-19 20:51 ` Jonathan Corbet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox