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

From: Daniel Borkmann
Date: Mon Feb 20 2017 - 04:01:45 EST

On 02/20/2017 12:56 AM, Stephen Rothwell wrote:
Hi Kees,

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


between commit:

74451e66d516 ("bpf: make jited programs visible in traces")

from the net-next tree and commit:

0f5bf6d0afe4 ("arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX")

from the kspp 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 thanks!