Hi Russell,
Russell King - ARM Linux wrote:
> 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: [EMAIL PROTECTED]
> L: [EMAIL PROTECTED] (subscribers-only)
> S: Maintained
>
> +++ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
> +++P: Mike Rapoport
> +++M: [EMAIL PROTECTED]
> +++L: [EMAIL PROTECTED] (subscribers-only)
> +++S: Maintained
> +++
>
> This is basically because 'master...pxa' has multiple common ancestors.
Hm, I don't see that with your current tree:
[EMAIL PROTECTED]:~/gsrc/linux-2.6$ git merge-base --all rmk/pxa
rmk/master
543cf4cb3fe6f6cae3651ba918b9c56200b257d0
and so git-diff -u rmk/master...rmk/pxa looks good here, too.
Anyway, IIRC you can apply the above patch with git-apply, didn't test
it though. And if you don't want the people having to rely on git, you
still can merge master and pxa and provide a diff between some fixed
base and the merge result. (Or provide two patches and let the others
do the merge.)
Best regards
Uwe
--
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
_______________________________________________
i2c mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/i2c
