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,
Xiubo Li <Li.Xiubo@freescale.com>,
Wolfram Sang <wsa@the-dreams.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the watchdog tree
Date: Sun, 14 Dec 2014 20:35:06 -0800 [thread overview]
Message-ID: <20141215043506.GB3949@kroah.com> (raw)
In-Reply-To: <20141215141114.575b8767@canb.auug.org.au>
On Mon, Dec 15, 2014 at 02:11:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/watchdog/imx2_wdt.c between commit 6dc21678dbd9 ("watchdog:
> imx2_wdt: Add power management support") from the watchdog tree and
> commit fa21a580dea4 ("watchdog: drop owner assignment from
> platform_drivers") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
How is this happening, nothing has changed in my trees, did something
new get added to the watchdog tree?
thanks,
greg k-h
next prev parent reply other threads:[~2014-12-15 4:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-15 3:11 linux-next: manual merge of the driver-core tree with the watchdog tree Stephen Rothwell
2014-12-15 4:35 ` Greg KH [this message]
2014-12-15 5:09 ` Stephen Rothwell
2014-12-15 17:02 ` Greg KH
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=20141215043506.GB3949@kroah.com \
--to=greg@kroah.com \
--cc=Li.Xiubo@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wim@iguana.be \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).