Messages in this thread | | | Date | Wed, 9 May 2018 20:44:07 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
Hi Anders,
On Wed, 9 May 2018 10:24:49 +0200 Anders Roxell <anders.roxell@linaro.org> wrote: > > On 9 May 2018 at 06:19, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh > > - TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh > > + TEST_PROGS += fib_tests.sh fib-onlink-tests.sh in_netns.sh pmtu.sh udpgso.sh > > in_netns.sh shouldn't be in the above list, its already in the > TEST_PROGS_EXTENDED below.
Thanks for that, I have fixed up my merge resolution for tomorrow.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |