From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Networking <netdev@vger•kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
David Woodhouse <dwmw@amazon•co.uk>,
Thomas Gleixner <tglx@linutronix•de>,
Masami Hiramatsu <mhiramat@kernel•org>
Subject: linux-next: manual merge of the bpf-next tree with Linus' tree
Date: Mon, 15 Jan 2018 11:15:53 +1100 [thread overview]
Message-ID: <20180115111553.3687282a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
arch/x86/lib/Makefile
between commit:
76b043848fd2 ("x86/retpoline: Add initial retpoline support")
from Linus' tree and commit:
540adea3809f ("error-injection: Separate error-injection from kprobe")
from the bpf-next 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/x86/lib/Makefile
index f23934bbaf4e,171377b83be1..000000000000
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@@ -26,7 -26,7 +26,8 @@@ lib-y += memcpy_$(BITS).
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o
lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o
+lib-$(CONFIG_RETPOLINE) += retpoline.o
+ lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o
next reply other threads:[~2018-01-15 0:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 0:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-24 0:19 linux-next: manual merge of the bpf-next tree with Linus' tree Stephen Rothwell
2018-12-21 2:36 Stephen Rothwell
2019-08-08 2:53 Stephen Rothwell
2019-11-19 0:43 Stephen Rothwell
2019-12-15 23:26 Stephen Rothwell
2020-03-31 0:40 Stephen Rothwell
2020-08-24 0:56 Stephen Rothwell
2022-01-24 21:43 Stephen Rothwell
2022-01-24 21:56 Stephen Rothwell
2023-01-23 22:44 Stephen Rothwell
2023-01-23 22:58 ` Stanislav Fomichev
2024-10-22 1:02 Stephen Rothwell
2024-10-22 3:07 ` Andrii Nakryiko
2024-10-22 14:15 ` Viktor Malik
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=20180115111553.3687282a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ast@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=dwmw@amazon$(echo .)co.uk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
/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