From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753766AbbE1OIW (ORCPT ); Thu, 28 May 2015 10:08:22 -0400 Received: from mail-bl2on0102.outbound.protection.outlook.com ([65.55.169.102]:50342 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753870AbbE1OIG (ORCPT ); Thu, 28 May 2015 10:08:06 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; canb.auug.org.au; dkim=none (message not signed) header.d=none; X-WSS-ID: 0NP2B2F-07-OAL-02 X-M-MSG: Message-ID: <55671982.6030806@amd.com> Date: Thu, 28 May 2015 08:34:58 -0500 From: Tom Lendacky User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Stephen Rothwell , David Miller , CC: , Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree References: <20150528141716.562c15e1@canb.auug.org.au> In-Reply-To: <20150528141716.562c15e1@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.180.168.240] X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD018;1:QDGOCJTo4RFIfUxSIJbQehqMZEMS8sOQXE9a/d0iVbfQLwkw5P/MgSHCuvLvh8dpwctGcylAt/LPyxBCWXj4FZzqov1AcAvd6Dr4kqJBhaC0DPk8zCq3137x3X5575GyjOcXnfawgphHvjq9L8ANuuWNti9Dl5MW0ZFVx/c2aE8NgQ2g1YjzxNmarw2+6jxNlkjEjgj+XlY4skDafRBMD7+a0IFxoSFmDHwh7ulMGphTVU6w2VoCYAqYkJwlGGkMTVXeNnNWpopsVK8NrGgCqg== X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(428002)(164054003)(377454003)(51704005)(53754006)(189002)(199003)(24454002)(479174004)(86362001)(92566002)(5001830100001)(87936001)(64126003)(50986999)(189998001)(101416001)(64706001)(83506001)(65816999)(23746002)(99136001)(54356999)(105586002)(36756003)(50466002)(106466001)(117636001)(77156002)(5001860100001)(59896002)(68736005)(62966003)(77096005)(4001350100001)(65956001)(76176999)(87266999)(65806001)(5001770100001)(4001540100001)(97736004)(2950100001)(47776003)(46102003)(62816006);DIR:OUT;SFP:1102;SCL:1;SRVR:BN1PR02MB072;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR02MB072; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(520003)(3002001);SRVR:BN1PR02MB072;BCL:0;PCL:0;RULEID:;SRVR:BN1PR02MB072; X-Forefront-PRVS: 0590BBCCBC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2015 13:35:04.7659 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR02MB072 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >