Messages in this thread | | | Date | Mon, 20 Feb 2017 10:02:36 +0100 | From | Daniel Borkmann <> | Subject | Re: linux-next: manual merge of the tip tree with the net-next tree |
| |
On 02/20/2017 02:22 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > kernel/extable.c > > between commit: > > 74451e66d516 ("bpf: make jited programs visible in traces") > > from the net-next tree and commit: > > 5b485629ba0d ("kprobes, extable: Identify kprobes trampolines as kernel text area") > > from the tip 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.
Looks good to me, thanks!
| |