[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20180509204407.587b4324@canb.auug.org.au>
Date: Wed, 9 May 2018 20:44:07 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Anders Roxell <anders.roxell@...aro.org>
Cc: David Miller <davem@...emloft.net>,
Networking <netdev@...r.kernel.org>,
Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
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@...aro.org> wrote:
>
> On 9 May 2018 at 06:19, Stephen Rothwell <sfr@...b.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists