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: Thu, 02 Oct 2014 11:27:08 -0700 (PDT) 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, hayeswang@...ltek.com Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Thu, 2 Oct 2014 14:16:41 +1000 > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/usb/r8152.c between commit 204c87041289 ("r8152: remove > clearing bp") from the net tree and commit 8ddfa07778af ("r8152: use > usleep_range") from the net-next tree. > > I fixed it up (the former removed some of the code updated by the > latter) and can carry the fix as necessary (no action is required). I'm merging net into net-next today and thus resolving this. Thanks Stephen! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists