* linux-next: manual merge of the bkl-trivial tree with the hfsplus tree
@ 2010-10-03 23:47 Stephen Rothwell
2010-10-04 3:34 ` Christoph Hellwig
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2010-10-03 23:47 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Christoph Hellwig
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi Arnd,
Today's linux-next merge of the bkl-trivial tree got a conflict in
fs/hfsplus/ioctl.c between commits
94744567fef9602c3d8218a1d8f58c04cce354f6 ("hfsplus: split hfsplus_ioctl")
and 6333816ade7e04a96ec0a34a8378c455e4f7c4dd ("hfsplus: protect setflags
using i_mutex") from the hfsplus tree and commit
65c7297b0322453d238b2d23918a3a8b3a223c3b ("drivers: autoconvert trivial
BKL users to private mutex") from the bkl-trivial tree.
The second of the hfsplus tree commits seems to supercede the bkl-trivial
one, so I used that.
--
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] 4+ messages in thread* Re: linux-next: manual merge of the bkl-trivial tree with the hfsplus tree
2010-10-03 23:47 linux-next: manual merge of the bkl-trivial tree with the hfsplus tree Stephen Rothwell
@ 2010-10-04 3:34 ` Christoph Hellwig
2010-10-04 8:23 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2010-10-04 3:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Arnd Bergmann, linux-next, linux-kernel
On Mon, Oct 04, 2010 at 10:47:40AM +1100, Stephen Rothwell wrote:
> Hi Arnd,
>
> The second of the hfsplus tree commits seems to supercede the bkl-trivial
> one, so I used that.
Yes, the hfsplus tree contains a proper BKL removal for hfsplus.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the bkl-trivial tree with the hfsplus tree
2010-10-04 3:34 ` Christoph Hellwig
@ 2010-10-04 8:23 ` Arnd Bergmann
2010-10-04 8:29 ` Christoph Hellwig
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2010-10-04 8:23 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Stephen Rothwell, linux-next, linux-kernel
On Monday 04 October 2010 05:34:41 Christoph Hellwig wrote:
> On Mon, Oct 04, 2010 at 10:47:40AM +1100, Stephen Rothwell wrote:
> > Hi Arnd,
> >
> > The second of the hfsplus tree commits seems to supercede the bkl-trivial
> > one, so I used that.
>
> Yes, the hfsplus tree contains a proper BKL removal for hfsplus.
Ok. I've removed the pushdown into hfsplus and subsequent removal from my
tree now, thanks! I've also removed the pushdown from other file systems
that are already BKL-free.
Christoph, are you planning to take care of freevxfs, too? I can't figure
out whether readdir and lookup actually need locking there.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the bkl-trivial tree with the hfsplus tree
2010-10-04 8:23 ` Arnd Bergmann
@ 2010-10-04 8:29 ` Christoph Hellwig
0 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2010-10-04 8:29 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Christoph Hellwig, Stephen Rothwell, linux-next, linux-kernel
On Mon, Oct 04, 2010 at 10:23:45AM +0200, Arnd Bergmann wrote:
> Christoph, are you planning to take care of freevxfs, too? I can't figure
> out whether readdir and lookup actually need locking there.
They shouldn't, but I'll take a look.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-04 8:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-03 23:47 linux-next: manual merge of the bkl-trivial tree with the hfsplus tree Stephen Rothwell
2010-10-04 3:34 ` Christoph Hellwig
2010-10-04 8:23 ` Arnd Bergmann
2010-10-04 8:29 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).