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
| ||
|
Message-Id: <20170503.000856.253462815755050143.davem@davemloft.net> Date: Wed, 03 May 2017 00:08:56 -0400 (EDT) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, egtvedt@...fundet.no, hskinnemoen@...il.com, nicolas.ferre@...rochip.com, johunt@...mai.com, sridhar.samudrala@...el.com, alexander.h.duyck@...el.com Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Wed, 3 May 2017 11:07:03 +1000 > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/avr32/include/uapi/asm/socket.h > > between commit: > > 26202873bb51 ("avr32: remove support for AVR32 architecture") > > from Linus' tree and commits: > > a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt") > 6d4339028b35 ("net: Introduce SO_INCOMING_NAPI_ID" > 5daab9db7b65 ("New getsockopt option to get socket cookie") > > from the net-next tree. > > I fixed it up (I removed the file) 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. Duly noted in the pull request I sent to Linus, and now that he took net-next in it is resolved in his tree. Thanks!
Powered by blists - more mailing lists