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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpX1zQzXrRUu.pgp
Description: PGP signature
