From: Stephen Rothwell <sfr@canb•auug.org.au>
To: 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: linux-next: manual merge of the akpm-current tree with the integrity tree
Date: Fri, 13 Mar 2020 21:07:14 +1100 [thread overview]
Message-ID: <20200313210714.58ff3d99@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2071 bytes --]
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 ...
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/Kconfig
index 4e4f6f4200b8,ca6f12f34d92..000000000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -137,6 -138,6 +137,7 @@@ config X8
select HAVE_ARCH_JUMP_LABEL_RELATIVE
select HAVE_ARCH_KASAN if X86_64
select HAVE_ARCH_KASAN_VMALLOC if X86_64
++ select HAVE_ARCH_KCSAN if X86_64
select HAVE_ARCH_KGDB
select HAVE_ARCH_MMAP_RND_BITS if MMU
select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
@@@ -148,6 -149,6 +149,7 @@@
select HAVE_ARCH_TRACEHOOK
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64
++ select HAVE_ARCH_USERFAULTFD_WP if USERFAULTFD
select HAVE_ARCH_VMAP_STACK if X86_64
select HAVE_ARCH_WITHIN_STACK_FRAMES
select HAVE_ASM_MODVERSIONS
@@@ -229,8 -230,7 +231,7 @@@
select VIRT_TO_BUS
select X86_FEATURE_NAMES if PROC_FS
select PROC_PID_ARCH_STATUS if PROC_FS
- select HAVE_ARCH_KCSAN if X86_64
- select HAVE_ARCH_USERFAULTFD_WP if USERFAULTFD
+ imply IMA_SECURE_AND_OR_TRUSTED_BOOT if EFI
config INSTRUCTION_DECODER
def_bool y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-13 10:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 10:07 Stephen Rothwell [this message]
2020-03-13 14:54 ` linux-next: manual merge of the akpm-current tree with the integrity tree Mimi Zohar
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=20200313210714.58ff3d99@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aarcange@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=elver@google$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=nayna@linux$(echo .)ibm.com \
--cc=paulmck@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/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