Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1585950

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

Show all headers | View raw

On 02/22/2017 12:15 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>    arch/s390/net/bpf_jit_comp.c
>
> between commit:
>
>    9437964885f8 ("s390/bpf: remove redundant check for non-null image")
>
> from the s390 tree and commit:
>
>    9d876e79df6a ("bpf: fix unlocking of jited image when module ronx not set")
>
> 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.

Looks good, thanks!

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the s390 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-22 00:20 +0100
  Re: linux-next: manual merge of the net-next tree with the s390 tree Daniel Borkmann <daniel@iogearbox.net> - 2017-02-22 07:40 +0100

csiph-web