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

2018-05-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: arch/s390/net/Makefile between commit: 866f4c8e0e26 ("s390/net: add pnetid support") from the s390 tree and commit: e1cf4befa297 ("bpf, s390x: remove ld_abs/ld_ind") from the net-next tree. I fixed it up (see

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

2018-05-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: arch/s390/net/Makefile between commit: 866f4c8e0e26 ("s390/net: add pnetid support") from the s390 tree and commit: e1cf4befa297 ("bpf, s390x: remove ld_abs/ld_ind") from the net-next tree. I fixed it up (see

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

2017-02-21 Thread Daniel Borkmann
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

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

2017-02-21 Thread Daniel Borkmann
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

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

2017-02-21 Thread Stephen Rothwell
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

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

2017-02-21 Thread Stephen Rothwell
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