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, 8 Mar 2016 11:37:19 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@...csson.com> Subject: linux-next: manual merge of the net-next tree with the net tree Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/tipc/subscr.c between commit: 4de13d7ed6ff ("tipc: fix nullptr crash during subscription cancel") from the net tree and commit: 7c13c6224123 ("tipc: introduce tipc_subscrb_subscribe() routine") (and following ones) from the net-next tree. I fixed it up (I used the net-next tree version as it is not obvious tha the net tree patch is still needed) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists