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
Date: Wed, 2 Mar 2016 09:43:54 -0800 [thread overview]
Message-ID: <20160302174354.GB24233@kroah.com> (raw)
In-Reply-To: <20160302143127.6a17dc75@canb.auug.org.au>
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
prev parent reply other threads:[~2016-03-02 17:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 3:31 linux-next: manual merge of the staging tree with the watchdog tree Stephen Rothwell
2016-03-02 17:43 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160302174354.GB24233@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=kyle.roeschley@ni$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tomas.winkler@intel$(echo .)com \
--cc=wim@iguana$(echo .)be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox