Messages in this thread | | | Date | Wed, 2 Aug 2017 19:42:31 -0700 | From | Stephen Hemminger <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
On Thu, 3 Aug 2017 12:01:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/hyperv/netvsc.c > > between commit: > > 4a0dee1ffe0e ("netvsc: Initialize 64-bit stats seqcount") > > from the net tree and commit: > > 35fbbccfb417 ("netvsc: save pointer to parent netvsc_device in channel table") > > 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. >
Thanks, that looks right.
| |