Re: [i2c] [PATCH 1/1] I2C pxa fast mode (400khz) support

[Russell King - ARM Linux <linux@arm.linux.org.uk>]

On Tue, Jul 15, 2008 at 10:43:24AM +0100, Ben Dooks wrote:
> I think most of RMK's pxa tree has been merged, so a diff
> against a current -git release should give you a better
> starting point.

There's still around 300K of PXA stuff outstanding - but unfortunately
I can't update the 'nightly' snapshots with the outstanding commits
because I can't get a reasonable patch out of git:

$ git-diff -u master...pxa |less
diff --cc MAINTAINERS
index 1528e58,8f0ec46,c68a118..20aef95
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -481,11 -475,11 -475,11 +475,28 @@@@ M:    kernel@wantstofly.or
   L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
   S:   Maintained

+++ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+++P:   Mike Rapoport
+++M:   mike@compulab.co.il
+++L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+++S:   Maintained
+++

This is basically because 'master...pxa' has multiple common ancestors.

You can get a diff from 'master..pxa' but that will be a patch which
removes changes in master but not pxa, and applies changes in pxa but
not master, which isn't useful.

Of course, those with git can get the full tree and there isn't a
problem moving through the history... those using the patches, however,
are going to be facing a problem for the time being.

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php