From: Mimi Zohar <zohar@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrea Arcangeli <aarcange@redhat.com>,
Nayna Jain <nayna@linux.ibm.com>, Marco Elver <elver@google.com>,
"Paul E. McKenney" <paulmck@kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the integrity tree
Date: Fri, 13 Mar 2020 10:54:12 -0400 [thread overview]
Message-ID: <1584111252.5188.16.camel@linux.ibm.com> (raw)
In-Reply-To: <20200313210714.58ff3d99@canb.auug.org.au>
On Fri, 2020-03-13 at 21:07 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/x86/Kconfig
>
> between commits:
>
> 9e2b4be377f0 ("ima: add a new CONFIG for loading arch-specific policies")
>
> from the integrity tree and commit:
>
> faaa52178603 ("userfaultfd: wp: add WP pagetable tracking to x86")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> Note that I put the selects in their correct alphabetical position as
> asked by the comment higher up in the file. If that had been done in
> the patches, then there would have been no conflicts ...
True. Thanks, Stephan. Before moving it to "its proper location",
I'm wondering if there should be a separate section for "imply".
Mimi
prev parent reply other threads:[~2020-03-13 14:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 10:07 linux-next: manual merge of the akpm-current tree with the integrity tree Stephen Rothwell
2020-03-13 14:54 ` Mimi Zohar [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=1584111252.5188.16.camel@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=elver@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=nayna@linux.ibm.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=zohar@linux.vnet.ibm.com \
/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).