Re: linux-next: manual merge of the kspp tree with the file-locks tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the kspp tree with the file-locks tree
Date	2017-07-03 15:00 +0200
Message-ID	<tZ97j-1Az-5@gated-at.bofh.it> (permalink)
References	<tUHt0-2vO-19@gated-at.bofh.it> <tYYEV-2rT-5@gated-at.bofh.it> <tZ6Ma-8r6-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the kspp tree with the file-locks tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-21 08:40 +0200
  Re: linux-next: manual merge of the kspp tree with the file-locks  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-03 03:50 +0200
    Re: linux-next: manual merge of the kspp tree with the file-locks  tree Jeff Layton <jlayton@poochiereds.net> - 2017-07-03 12:30 +0200
      Re: linux-next: manual merge of the kspp tree with the file-locks  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-03 15:00 +0200

csiph-web