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: Tue, 22 Mar 2016 11:29:20 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Doug Ledford <dledford@...hat.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Bhaktipriya Shridhar <bhaktipriya96@...il.com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Mitko Haralanov <mitko.haralanov@...el.com> Subject: linux-next: manual merge of the rdma tree with Linus' tree Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/user_pages.c between commit: 7e43d4d25558 ("staging: rdma: hfi1: Compress return logic") from Linus' tree and commit: 0b091fb32c5a ("staging/hfi1: Enable TID caching feature") from the rdma tree. I fixed it up (the latter removed the function that was updated in the former) 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. -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists