Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1585949
| From | Daniel Borkmann <daniel@iogearbox.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the kspp tree with the net-next tree |
| Date | 2017-02-22 07:40 +0100 |
| Message-ID | <tdyKK-5Ut-11@gated-at.bofh.it> (permalink) |
| References | <tdsFj-1xD-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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!
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: manual merge of the kspp tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-22 01:10 +0100 Re: linux-next: manual merge of the kspp tree with the net-next tree Daniel Borkmann <daniel@iogearbox.net> - 2017-02-22 07:40 +0100
csiph-web