Re: linux-next: manual merge of the staging tree with the watchdog tree

From	Greg KH <greg@kroah.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the staging tree with the watchdog tree
Date	2016-03-02 18:50 +0100
Message-ID	<r8j4l-2TR-5@gated-at.bofh.it> (permalink)
References	<r85NL-1Xc-13@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the staging tree with the watchdog tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-02 04:40 +0100
  Re: linux-next: manual merge of the staging tree with the watchdog  tree Greg KH <greg@kroah.com> - 2016-03-02 18:50 +0100

csiph-web