lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 2 Aug 2017 19:42:31 -0700 From: Stephen Hemminger <stephen@...workplumber.org> To: Stephen Rothwell <sfr@...b.auug.org.au> 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>, Stephen Hemminger <sthemmin@...rosoft.com>, Florian Fainelli <f.fainelli@...il.com> 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@...b.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.
Powered by blists - more mailing lists