Messages in this thread | | | Date | Tue, 17 May 2016 08:05:11 +0200 | From | Daniel Borkmann <> | Subject | Re: linux-next: manual merge of the net-next tree with the arm64 tree |
| |
On 05/17/2016 02:24 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/arm64/Kconfig > > between commit: > > 8ee708792e1c ("arm64: Kconfig: remove redundant HAVE_ARCH_TRANSPARENT_HUGEPAGE definition") > > from the arm64 tree and commit: > > 6077776b5908 ("bpf: split HAVE_BPF_JIT into cBPF and eBPF variant") > > from the net-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.
Diff looks good, thanks!
| |