From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753364AbdIDEiZ (ORCPT ); Mon, 4 Sep 2017 00:38:25 -0400 Received: from ozlabs.org ([103.22.144.67]:60743 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750766AbdIDEiY (ORCPT ); Mon, 4 Sep 2017 00:38:24 -0400 Date: Mon, 4 Sep 2017 14:38:22 +1000 From: Stephen Rothwell To: "Rafael J. Wysocki" , Jean Delvare Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig , Lukas Wunner Subject: Re: linux-next: manual merge of the pm tree with the dmi tree Message-ID: <20170904143822.3b04f2fb@canb.auug.org.au> In-Reply-To: <20170807114033.4d484e6c@canb.auug.org.au> References: <20170807114033.4d484e6c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Mon, 7 Aug 2017 11:40:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the pm tree got a conflict in: > > drivers/acpi/sbs.c > > between commit: > > f996c4155d0d ("dmi: Mark all struct dmi_system_id instances const") > > from the dmi tree and commit: > > 630b3aff8a51 ("treewide: Consolidate Apple DMI checks") > > from the pm tree. > > I fixed it up (the latter removed the declaration updated by the former) > and can carry the fix as necessary. This 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. Just a reminder that the above conflict still exists. -- Cheers, Stephen Rothwell