linux-next: manual merge of the kspp tree with the net-next tree
From: Stephen Rothwell
Date: Tue Feb 21 2017 - 19:06:53 EST
Today's linux-next merge of the kspp tree got a conflict in:
9d876e79df6a ("bpf: fix unlocking of jited image when module ronx not set")
from the net-next tree and commit:
0f5bf6d0afe4 ("arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX")
from the kspp tree.
Hmmm, both these change the ifdef guards I have used the one from the
net-next tree (CONFIG_ARCH_HAS_SET_MEMORY) for today, please let me know
if that is not correct.
I fixed it up (see above) 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