linux-kernel - Re: linux-next: manual merge of the net-next tree with Linus' tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <55671982.6030806@amd.com>
Date:	Thu, 28 May 2015 08:34:58 -0500
From:	Tom Lendacky <thomas.lendacky@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree

On 05/27/2015 11:17 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/phy/amd-xgbe-phy.c between commit 983942a5eaca
> ("amd-xgbe-phy: Fix initial mode when autoneg is disabled") from Linus'
> tree and commit 7c12aa08779c ("amd-xgbe: Move the PHY support into
> amd-xgbe") from the net-next tree.
>
> I fixed it up (the latter removed the file, so I did that - there may
> be more needed) and can carry the fix as necessary (no action is
> required).

I looked over the tree and it appears that everything is good. Deleting
the file is the correct action and it looks like the necessary changes
to the Makefiles and Kconfigs are present to account for that.

Thanks,
Tom

>
--
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/