Hi all,
On Mon, 27 Jul 2020 19:27:21 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> net/ipv6/ip6_flowlabel.c
>
> between commit:
>
> ff6a4cf214ef ("net/ipv6: split up ipv6_flowlabel_opt")
>
> from the net-next tree and commit:
>
> 3f
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
net/ipv6/ip6_flowlabel.c
between commit:
ff6a4cf214ef ("net/ipv6: split up ipv6_flowlabel_opt")
from the net-next tree and commit:
3f649ab728cd ("treewide: Remove uninitialized_var() usage")
from the kspp tree.
I fix
On 02/22/2017 12:51 AM, Stephen Rothwell wrote:
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
arch/arm/Kconfig
between commit:
d2852a224050 ("arch: add ARCH_HAS_SET_MEMORY config")
from the net-next tree and commit:
ad21fc4faa2a ("arch: Move CONFIG_DEBUG_ROD
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 ("
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_MOD
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
arch/arm/Kconfig
between commit:
d2852a224050 ("arch: add ARCH_HAS_SET_MEMORY config")
from the net-next tree and commit:
ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to
be common")
from
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:
include/linux/filter.h
between commit:
74451e66d516 ("bpf: make jited programs visible in traces")
from the net-next tree and commit:
0f5bf6d0afe4 ("arch: Rename CO
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
include/linux/filter.h
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")
fro
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
arch/Kconfig
between commit:
1a8b6d76dc5b ("net:add one common config ARCH_WANT_RELAX_ORDER to support
relax ordering")
from the net-next tree and commits:
ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET
