Messages in this thread | | | Date | Mon, 18 Oct 2021 09:05:14 +0300 | From | Ido Schimmel <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On Mon, Oct 18, 2021 at 10:51:51AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/net/forwarding/forwarding.config.sample > > between commit: > > 0857d6f8c759 ("ipv6: When forwarding count rx stats on the orig netdev") > > from the net tree and commit: > > 45d45e5323a9 ("testing: selftests: forwarding.config.sample: Add tc flag") > > 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.
Looks good to me. Thanks!
| |