lkml.org 
[lkml]   [2016]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging tree with the watchdog tree
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

\
 
 \ /
  Last update: 2016-03-02 19:21    [W:0.026 / U:0.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site