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: Fri, 19 Feb 2016 09:50:31 +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, Clemens Gruber <clemens.gruber@...ruber.com>, Stefan Roese <sr@...x.de> 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: drivers/net/phy/marvell.c between commit: 79be1a1c9090 ("phy: marvell: Fix and unify reg-init behavior") from the net tree and commit: 930b37ee8d84 ("net: phy: Add SGMII support for Marvell 88E1510/1512/1514/1518") from the net-next tree. OK, I didn't know how to resolve this, so I just used the net-next tree version (which is probably wrong, but will build). -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists