From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
James Bottomley <James.Bottomley@HansenPartnership•com>,
Kyle McMartin <kyle@mcmartin•ca>,
linux-parisc@vger•kernel.org
Subject: Re: linux-next: manual merge of the driver-core tree with the parisc tree
Date: Sun, 1 Feb 2009 20:41:44 -0800 [thread overview]
Message-ID: <20090202044144.GA12243@kroah.com> (raw)
In-Reply-To: <20090202111112.731a6816.sfr@canb.auug.org.au>
On Mon, Feb 02, 2009 at 11:11:12AM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got conflicts in
> drivers/char/agp/parisc-agp.c, drivers/parisc/gsc.c and
> drivers/parisc/sba_iommu.c between commit
> a130bf34da4b64d7b289e2358530ef5d4ab27efd ("parisc: remove klist
> iterators") from the parisc tree and commit
> 135bd8a5aeed90af407aeeede9587ee99c5606b2 ("parisc: don't touch driver
> core internals") from the driver-core tree.
>
> These two commits seem to be trying to do similar things. I have used
> the versions from the parisc tree. Greg, I guess you need to check to
> see if you agree and if so, then just remove the driver-core tree patch.
Yes, the parisc version is fine.
> James, Kyle, the one thing I took from Greg's patch was the removal of
> the include of linux/klist.h from drivers/char/agp/parisc-agp.c.
That would be good as well.
I'll fix up my tree tomorrow.
thanks,
greg k-h
next prev parent reply other threads:[~2009-02-02 4:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-02 0:11 linux-next: manual merge of the driver-core tree with the parisc tree Stephen Rothwell
2009-02-02 4:41 ` Greg KH [this message]
2009-02-02 5:04 ` 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=20090202044144.GA12243@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=kyle@mcmartin$(echo .)ca \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-parisc@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