From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Marshall <hubcap@omnibond•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>,
Martin Brandenburg <martin@omnibond•com>
Subject: Re: linux-next: manual merge of the vfs tree with the orangefs tree
Date: Sat, 4 May 2019 08:26:34 +1000 [thread overview]
Message-ID: <20190504082634.6f78a061@canb.auug.org.au> (raw)
In-Reply-To: <CAOg9mSSGUiCoeecpdLs-8-TAMkVDubHK5jG87dGseV4gkGRiOQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
Hi Mike,
On Fri, 3 May 2019 13:34:49 -0400 Mike Marshall <hubcap@omnibond•com> wrote:
>
> I noticed the conflict too when I added Al's patch series to the orangefs
> tree we have on next. I understood Linus to say he'd fix the conflict the
> way you did during the merge window. I guess that means you'll have to
> keep fixing it on next until then... I hate causing trouble, let me know if
> there's something different I should do to help...
Its all good. I use "git rerere" which remembers the conflicts I have
fixed once and fixes them automatically the next time I do the same
merge.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-05-03 22:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 1:15 linux-next: manual merge of the vfs tree with the orangefs tree Stephen Rothwell
2019-05-03 17:34 ` Mike Marshall
2019-05-03 22:26 ` Stephen Rothwell [this message]
2019-05-08 1:02 ` Stephen Rothwell
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=20190504082634.6f78a061@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hubcap@omnibond$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin@omnibond$(echo .)com \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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