From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936133AbcI3Fxc (ORCPT ); Fri, 30 Sep 2016 01:53:32 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46846 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936000AbcI3FxP (ORCPT ); Fri, 30 Sep 2016 01:53:15 -0400 X-Sasl-enc: Umw9wlYmtqlvWwMVyMTUhEjpmRHYcfFZNJ8iayBNh9A0 1475214275 Date: Fri, 30 Sep 2016 07:44:41 +0200 From: Greg KH To: Stephen Rothwell Cc: "Rafael J. Wysocki" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Aleksey Makarov , Mika Westerberg Subject: Re: linux-next: manual merge of the tty tree with the pm tree Message-ID: <20160930054441.GC5458@kroah.com> References: <20160930134223.4eb0767d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160930134223.4eb0767d@canb.auug.org.au> User-Agent: Mutt/1.7.0 (2016-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 30, 2016 at 01:42:23PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > include/linux/acpi.h > > between commit: > > 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") > > from the pm tree and commit: > > ad1696f6f09d ("ACPI: parse SPCR and enable matching console") > > from the tty 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. Looks good to me, thanks. greg k-h