From: Arnd Bergmann <arnd-r2nGTMty4D4@public•gmane.org>
To: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>
Cc: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public•gmane.org>,
linux-next-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
Ben Greear <greearb-my8/4N5VtI7c+919tysfdA@public•gmane.org>,
linux-cifs-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
Jan Blunck <jblunck-wEGCiKHe2LqWVfeAwA7xHQ@public•gmane.org>
Subject: Re: linux-next: manual merge of the bkl-vfs tree with the cifs tree
Date: Tue, 21 Sep 2010 09:59:49 +0200 [thread overview]
Message-ID: <201009210959.50115.arnd@arndb.de> (raw)
In-Reply-To: <AANLkTikbM17xs41abm+6DTa9DJLYM8XYeVg=bZr_n8M5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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
prev parent reply other threads:[~2010-09-21 7:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=201009210959.50115.arnd@arndb.de \
--to=arnd-r2ngtmty4d4@public$(echo .)gmane.org \
--cc=greearb-my8/4N5VtI7c+919tysfdA@public$(echo .)gmane.org \
--cc=jblunck-wEGCiKHe2LqWVfeAwA7xHQ@public$(echo .)gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public$(echo .)gmane.org \
--cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public$(echo .)gmane.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