From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arun Murthy <arun.murthy@stericsson.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Masayuki Ohtak <masa-korg@dsn.okisemi.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the mfd tree
Date: Mon, 13 Sep 2010 21:09:15 -0700 [thread overview]
Message-ID: <20100914040915.GD11972@kroah.com> (raw)
In-Reply-To: <20100914122510.99c3e3b3.sfr@canb.auug.org.au>
On Tue, Sep 14, 2010 at 12:25:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/misc/Makefile between commit
> 03f582a93ecca6e9584b622570022abf08ed03ec ("misc: Add ab8500 pwm driver")
> from the mfd tree and commit b6de6c8f5a6fc18c5c67bb4e53f3d0cfd266b07b
> ("add Packet hub driver for Topcliff Platform controller hub") from the
> driver-core tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Fix looks fine to me, thanks.
greg k-h
next prev parent reply other threads:[~2010-09-14 4:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-14 2:25 linux-next: manual merge of the driver-core tree with the mfd tree Stephen Rothwell
2010-09-14 4:09 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-29 3:43 Stephen Rothwell
2012-11-29 5:21 ` Greg KH
2012-11-29 3:47 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:50 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 3:57 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 4:00 Stephen Rothwell
2012-11-29 5:20 ` Greg KH
2012-11-29 4:18 Stephen Rothwell
2012-11-29 5:19 ` Greg KH
2014-11-10 4:24 Stephen Rothwell
2014-11-10 4:39 ` 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=20100914040915.GD11972@kroah.com \
--to=greg@kroah.com \
--cc=arun.murthy@stericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masa-korg@dsn.okisemi.com \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/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