| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 18 Apr 2016 14:27:49 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jikos@...nel.org>,
Michael Ellerman <mpe@...erman.id.au>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
<linuxppc-dev@...ts.ozlabs.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Daniel Axtens <dja@...ens.net>
Subject: linux-next: manual merge of the livepatching tree with the powerpc
tree
Hi Jiri,
Today's linux-next merge of the livepatching tree got a conflict in:
arch/powerpc/kernel/process.c
between commit:
7f92bc569455 ("powerpc: sparse: Include headers for __weak symbols")
from the powerpc tree and commit:
5d31a96e6c01 ("powerpc/livepatch: Add livepatch stack to struct thread_info")
from the livepatching 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.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/kernel/process.c
index 4695088e7dd2,a290ee374aa0..000000000000
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@@ -56,7 -55,8 +56,9 @@@
#include <asm/firmware.h>
#endif
#include <asm/code-patching.h>
+#include <asm/exec.h>
+ #include <asm/livepatch.h>
+
#include <linux/kprobes.h>
#include <linux/kdebug.h>
Powered by blists - more mailing lists