Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751355AbdHaBID (ORCPT ); Wed, 30 Aug 2017 21:08:03 -0400 Received: from ozlabs.org ([103.22.144.67]:40271 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822AbdHaBIC (ORCPT ); Wed, 30 Aug 2017 21:08:02 -0400 Date: Thu, 31 Aug 2017 11:07:59 +1000 From: Stephen Rothwell To: "Rafael J. Wysocki" , Jean Delvare Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig , Toshi Kani Subject: linux-next: manual merge of the pm tree with the dmi tree Message-ID: <20170831110759.334c9fe2@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 Content-Length: 703 Lines: 26 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 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. -- Cheers, Stephen Rothwell