From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756395AbcK2JEi (ORCPT ); Tue, 29 Nov 2016 04:04:38 -0500 Received: from mx2.suse.de ([195.135.220.15]:47674 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755581AbcK2JEZ (ORCPT ); Tue, 29 Nov 2016 04:04:25 -0500 Date: Tue, 29 Nov 2016 10:01:41 +0100 From: Borislav Petkov To: Stephen Rothwell , David Miller Cc: Networking , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Lendacky Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20161129090141.qabvgzjrwd4wd2ql@pd.tnic> References: <20161129112232.333d3363@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161129112232.333d3363@canb.auug.org.au> User-Agent: NeoMutt/20161014 (1.7.1) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 29, 2016 at 11:22:32AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/amd/xgbe/xgbe-main.c > > between commit: > > 91eefaabf102 ("amd-xgbe: Fix unused suspend handlers build warning") > > from the net tree and commit: > > bd8255d8ba35 ("amd-xgbe: Prepare for supporting PCI devices") > > from the net-next tree. > > I fixed it up (the latter removed the code modified by the former) ... except that +#ifdef CONFIG_PM is present in the new drivers/net/ethernet/amd/xgbe/xgbe-platform.c now. So actually the proper fix is, IMO, to convert: +#ifdef CONFIG_PM +static int xgbe_platform_suspend(struct device *dev) to +#ifdef CONFIG_PM_SLEEP +static int xgbe_platform_suspend(struct device *dev) so that it doesn't fire again. David, would you prefer a patch against linux-next? -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg) --