* linux-next: manual merge of the driver-core tree with the parisc tree
@ 2009-02-02 0:11 Stephen Rothwell
2009-02-02 4:41 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-02-02 0:11 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, James Bottomley, Kyle McMartin, linux-parisc
[-- Attachment #1: Type: text/plain, Size: 874 bytes --]
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.
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the parisc tree
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
2009-02-02 5:04 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2009-02-02 4:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, James Bottomley, Kyle McMartin, linux-parisc
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the driver-core tree with the parisc tree
2009-02-02 4:41 ` Greg KH
@ 2009-02-02 5:04 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-02-02 5:04 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, James Bottomley, Kyle McMartin, linux-parisc
[-- Attachment #1: Type: text/plain, Size: 707 bytes --]
Hi Greg,
On Sun, 1 Feb 2009 20:41:44 -0800 Greg KH <greg@kroah•com> wrote:
>
> > 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 for checking.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-02 5:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2009-02-02 5:04 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox