From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Walker <dwalker@fifo99.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Howells <dhowells@redhat.com>
Subject: Re: linux-next: manual merge of the cisco tree with the vfs tree
Date: Tue, 15 Jan 2019 11:18:45 +1100 [thread overview]
Message-ID: <20190115111845.0898c0c6@canb.auug.org.au> (raw)
In-Reply-To: <20190114225412.GD18707@fifo99.com>
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi Daniel,
On Mon, 14 Jan 2019 14:54:12 -0800 Daniel Walker <dwalker@fifo99.com> wrote:
>
> I did a rebase after your original made this. I'm not sure it's needed any
> longer. However, I was planning to rebase my tree again on top of the latest
> Linus tree. How would you like to proceed ?
I still get the conflict when I merge your tree, but it is not such a
bit conflict that it warrants rebasing your tree to get rid of it. It
will be sorted out easily enough when Linus merges your tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-01-15 0:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 6:29 linux-next: manual merge of the cisco tree with the vfs tree Stephen Rothwell
2019-01-14 22:33 ` Stephen Rothwell
2019-01-14 22:54 ` Daniel Walker
2019-01-15 0:18 ` Stephen Rothwell [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=20190115111845.0898c0c6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=dwalker@fifo99.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).