From: Paul Mundt <lethal@linux-sh•org>
To: Greg KH <greg@kroah•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, Kay Sievers <kay.sievers@vrfy•org>,
Adrian McMenamin <adrian@mcmen•demon.co.uk>
Subject: Re: linux-next: manual merge of the driver-core tree with the sh tree
Date: Tue, 3 Mar 2009 09:12:18 +0900 [thread overview]
Message-ID: <20090303001217.GB4781@linux-sh.org> (raw)
In-Reply-To: <20090302235926.GA2690@kroah.com>
On Mon, Mar 02, 2009 at 03:59:26PM -0800, Greg KH wrote:
> On Tue, Mar 03, 2009 at 10:45:33AM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the driver-core tree got a conflict in
> > drivers/sh/maple/maple.c between commit
> > b233b28eac0cc37d07c2d007ea08c86c778c5af4 ("sh: maple: Support block reads
> > and writes") from the sh tree and commit
> > f1f93f5605f08a698418e52828bef46973b6a4ec ("sh: struct device - replace
> > bus_id with dev_name(), dev_set_name()") from the driver-core tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
> >
> > Maybe we could persuade Paul to apply the driver-core patch (not the
> > patch below)to the sh tree (assuming he has been sent a copy)?
>
> I think he was sent a copy, Kay?
>
> Anyway, Paul, here's the patch, could you take this through your tree to
> prevent future conflicts? It should build and work today, no
> dependancies on any other patch
>
I'm a bit behind on pending patches due to travel, so it's possible I
just missed the earlier iteration. In any event, I've queued this up now,
thanks!
next prev parent reply other threads:[~2009-03-03 0:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-02 23:45 linux-next: manual merge of the driver-core tree with the sh tree Stephen Rothwell
2009-03-02 23:59 ` Greg KH
2009-03-03 0:12 ` Paul Mundt [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-03-31 5:03 Stephen Rothwell
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=20090303001217.GB4781@linux-sh.org \
--to=lethal@linux-sh$(echo .)org \
--cc=adrian@mcmen$(echo .)demon.co.uk \
--cc=greg@kroah$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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