* linux-next: manual merge of the bkl-vfs tree with the cifs tree
@ 2010-09-21 6:10 Stephen Rothwell
[not found] ` <20100921161031.7745150e.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-09-21 6:10 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Ben Greear, Steve French, linux-cifs,
Jan Blunck
Hi Arnd,
Today's linux-next merge of the bkl-vfs tree got a conflict in
fs/cifs/cifsfs.c between commit d090dbeacd3763845d83d5de4d85aad025a28677
("cifs: Allow binding to local IP address") from the cifs tree and commit
b8f05b0b9ea89cfaf6759b1eb47fff683e7016a5 ("BKL: Remove BKL from CifsFS")
from the bkl-vfs tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/cifs/cifsfs.c
index 52e89ea,4e273f7..0000000
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -35,8 -35,6 +35,7 @@@
#include <linux/delay.h>
#include <linux/kthread.h>
#include <linux/freezer.h>
- #include <linux/smp_lock.h>
+#include <net/ipv6.h>
#include "cifsfs.h"
#include "cifspdu.h"
#define DECLARE_GLOBALS_HERE
^ permalink raw reply [flat|nested] 3+ messages in thread[parent not found: <20100921161031.7745150e.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>]
* Re: linux-next: manual merge of the bkl-vfs tree with the cifs tree [not found] ` <20100921161031.7745150e.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> @ 2010-09-21 6:17 ` Steve French [not found] ` <AANLkTikbM17xs41abm+6DTa9DJLYM8XYeVg=bZr_n8M5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Steve French @ 2010-09-21 6:17 UTC (permalink / raw) To: Stephen Rothwell Cc: Arnd Bergmann, linux-next-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Ben Greear, linux-cifs-u79uwXL29TY76Z2rM5mHXA, Jan Blunck Alternatively - I could merge the trivially modified bkl cifs patch into the cifs-2.6.git tree if that is easier On Tue, Sep 21, 2010 at 1:10 AM, Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public•gmane.org> wrote: > Hi Arnd, > > Today's linux-next merge of the bkl-vfs tree got a conflict in > fs/cifs/cifsfs.c between commit d090dbeacd3763845d83d5de4d85aad025a28677 > ("cifs: Allow binding to local IP address") from the cifs tree and commit > b8f05b0b9ea89cfaf6759b1eb47fff683e7016a5 ("BKL: Remove BKL from CifsFS") > from the bkl-vfs tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. > -- > Cheers, > Stephen Rothwell sfr-3FnU+UHB4dPYtjvyW6yDsg@public•gmane.org.org.au > > diff --cc fs/cifs/cifsfs.c > index 52e89ea,4e273f7..0000000 > --- a/fs/cifs/cifsfs.c > +++ b/fs/cifs/cifsfs.c > @@@ -35,8 -35,6 +35,7 @@@ > #include <linux/delay.h> > #include <linux/kthread.h> > #include <linux/freezer.h> > - #include <linux/smp_lock.h> > +#include <net/ipv6.h> > #include "cifsfs.h" > #include "cifspdu.h" > #define DECLARE_GLOBALS_HERE > -- Thanks, Steve ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <AANLkTikbM17xs41abm+6DTa9DJLYM8XYeVg=bZr_n8M5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: linux-next: manual merge of the bkl-vfs tree with the cifs tree [not found] ` <AANLkTikbM17xs41abm+6DTa9DJLYM8XYeVg=bZr_n8M5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2010-09-21 7:59 ` Arnd Bergmann 0 siblings, 0 replies; 3+ messages in thread From: Arnd Bergmann @ 2010-09-21 7:59 UTC (permalink / raw) To: Steve French Cc: Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Ben Greear, linux-cifs-u79uwXL29TY76Z2rM5mHXA, Jan Blunck On Tuesday 21 September 2010, Steve French wrote: > Alternatively - I could merge the trivially modified bkl cifs patch > into the cifs-2.6.git tree if that is easier Well, this is the most trivial sort of conflict, I guess we don't have to worry about it. Part of my patch reverts part of an earlier patch in the bkl-vfs series (by design, not by accident). We could sort that out, but my feeling is that it's not worth it. Arnd ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-21 7:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-21 6:10 linux-next: manual merge of the bkl-vfs tree with the cifs tree Stephen Rothwell
[not found] ` <20100921161031.7745150e.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-09-21 6:17 ` Steve French
[not found] ` <AANLkTikbM17xs41abm+6DTa9DJLYM8XYeVg=bZr_n8M5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-09-21 7:59 ` Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox