Re: linux-next: manual merge of the kspp tree with the net-next tree

[Daniel Borkmann]

On 02/22/2017 01:06 AM, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the kspp tree got a conflict in:

   include/linux/filter.h

between commit:

   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.

That's fine, thanks!