Messages in this thread | | | Date | Thu, 4 Jul 2019 12:07:46 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/net/config
between commit:
ff95bf28c234 ("selftests/net: skip psock_tpacket test if KALLSYMS was not enabled")
from the net tree and commit:
af5136f95045 ("selftests/net: SO_TXTIME with ETF and FQ") 509e56b37cc3 ("blackhole_dev: add a selftest")
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.
-- Cheers, Stephen Rothwell
diff --cc tools/testing/selftests/net/config index 3dea2cba2325,e4b878d95ba0..000000000000 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@@ -25,4 -25,6 +25,7 @@@ CONFIG_NF_TABLES_IPV6= CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_KALLSYMS=y + CONFIG_NET_SCH_FQ=m + CONFIG_NET_SCH_ETF=m + CONFIG_TEST_BLACKHOLE_DEV=m [unhandled content-type:application/pgp-signature] | |