From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756074AbcCBRn6 (ORCPT <rfc822;w@1wt.eu>);
	Wed, 2 Mar 2016 12:43:58 -0500
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:53330 "EHLO
	out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1755582AbcCBRn4 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 2 Mar 2016 12:43:56 -0500
X-Sasl-enc: rdGHCT46EaOrKrunna/7yRlY78nhX69cMb4Qn+qnf+/p 1456940635
Date: Wed, 2 Mar 2016 09:43:54 -0800
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wim Van Sebroeck <wim@iguana.be>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Tomas Winkler <tomas.winkler@intel.com>,
        Kyle Roeschley <kyle.roeschley@ni.com>
Subject: Re: linux-next: manual merge of the staging tree with the watchdog
 tree
Message-ID: <20160302174354.GB24233@kroah.com>
References: <20160302143127.6a17dc75@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160302143127.6a17dc75@canb.auug.org.au>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Mar 02, 2016 at 02:31:27PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/watchdog/Kconfig
>   drivers/watchdog/Makefile
> 
> between commit:
> 
>   70f3997667fb ("watchdog: ni903x_wdt: Add NI 903x/913x watchdog driver")
> 
> from the watchdog tree and commit:
> 
>   222818c3d84c ("watchdog: mei_wdt: implement MEI iAMT watchdog driver")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).


Looks good to me, thanks.

greg k-h