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, 31 Oct 2017 21:17:10 -0700 From: Cong Wang <xiyou.wangcong@...il.com> 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>, Jiri Pirko <jiri@...lanox.com> Subject: Re: linux-next: manual merge of the net-next tree with the net tree On Tue, Oct 31, 2017 at 5:58 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_api.c > > between commit: > > 822e86d997e4 ("net_sched: remove tcf_block_put_deferred()") > > from the net tree and commit: > > 8c4083b30e56 ("net: sched: add block bind/unbind notif. and extended block_get/put") > > from the net-next tree. Seems good. Thanks!
Powered by blists - more mailing lists