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, 16 Mar 2016 22:15:03 +0100 From: Andrew Lunn <andrew@...n.ch> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Linus Torvalds <torvalds@...ux-foundation.org>, Doug Ledford <dledford@...hat.com>, David Miller <davem@...emloft.net>, Network Development <netdev@...r.kernel.org>, linux-next <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Amir Vadai <amir@...ai.me>, Maor Gottlieb <maorg@...lanox.com> Subject: Re: linux-next: manual merge of the rdma tree with the net-next tree Hi Stephen > How about "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 want also want to Only the second want is required. > consider cooperate with the maintainer of the conflicting tree to cooperating Andrew
Powered by blists - more mailing lists