Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752018AbdIANUY (ORCPT ); Fri, 1 Sep 2017 09:20:24 -0400 Received: from mx2.suse.de ([195.135.220.15]:44984 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750952AbdIANUX (ORCPT ); Fri, 1 Sep 2017 09:20:23 -0400 Message-ID: <1504272021.4651.1.camel@suse.de> Subject: Re: linux-next: manual merge of the pm tree with the dmi tree From: Jean Delvare To: Stephen Rothwell , "Rafael J. Wysocki" Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig , Toshi Kani Date: Fri, 01 Sep 2017 15:20:21 +0200 In-Reply-To: <20170831110759.334c9fe2@canb.auug.org.au> References: <20170831110759.334c9fe2@canb.auug.org.au> Organization: Suse Linux Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 840 Lines: 32 Hi Stephen, On jeu., 2017-08-31 at 11:07 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the pm tree got a conflict in: > > drivers/acpi/blacklist.c > > between commit: > > f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const") > > from the dmi tree and commit: > > 5aa5911a0ed9 ("ACPI / blacklist: add acpi_match_platform_list()") > > from the pm tree. > > I fixed it up (see below) and can carry the fix as necessary. This Below, where? > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. -- Jean Delvare SUSE L3 Support