From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jeff Layton <jlayton@poochiereds.net>
Cc: Kees Cook <keescook@google.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kspp tree with the file-locks tree
Date: Mon, 3 Jul 2017 22:57:19 +1000 [thread overview]
Message-ID: <20170703225719.7c323d6a@canb.auug.org.au> (raw)
In-Reply-To: <1499077647.4737.2.camel@poochiereds.net>
Hi Jeff,
On Mon, 03 Jul 2017 06:27:27 -0400 Jeff Layton <jlayton@poochiereds.net> wrote:
>
> I think this is fairly trivial conflict -- Kees is adding the
> __randomize_layout attribute here, and I'm just adding a field to each
> of these structs.
Yep, nothing too tricky here.
> The main catch is that both of these branches have a fair number of
> preparatory patches before the above changes occur, so pulling one into
> the other is not trivial.
>
> Would it be best to just send the PRs to Linus and have him fix this up
> in the final merge?
Absolutely the right thing to do. The reminder is mainly so you can
just mention the conflict to Linus.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-07-03 12:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 6:32 linux-next: manual merge of the kspp tree with the file-locks tree Stephen Rothwell
2017-07-03 1:48 ` Stephen Rothwell
2017-07-03 10:27 ` Jeff Layton
2017-07-03 12:57 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-29 5:34 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=20170703225719.7c323d6a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jlayton@poochiereds.net \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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