[pkg-fso-maint] [PATCH] fix-glamo-mci-move-stop-out-of-isr.patch

[Luca Capello]

Hi Sascha!

On Fri, 27 Feb 2009 01:43:09 +0100, Sascha Wessel wrote:
> On Fri, Feb 27, 2009 at 12:21:47AM +0100, Luca Capello wrote:
>> Since the move to the andy-trackying branch was not without pain [2], I
>> would like to continue following it: it anyway seems that most of the
>> development is done there, which means that people would need to test
>> kernels built from there for bugfixes.  Thus, is it OK if I continue
>> with the andy-tracking branch?
>> 
>> [2] disclaimer: this requires a lot of time to be loaded!!!
>>     http://git.debian.org/?p=pkg-fso/linux-2.6-openmoko.git;a=commit;h=e16501d358feb5df92807d93da4bc6d7b0b72d01
>
> 2 days later, Andy did the same:
> http://git.openmoko.org/?p=kernel.git;a=commit;h=821e9fa664049b1e5e97a00f6eeed3b72b67c1ba
>
> So the move
> from	andy-tracking 	9029dff1f370018665a6e2999632a34fd0518f4d
> to	stable		821e9fa664049b1e5e97a00f6eeed3b72b67c1ba
> should be a trivial merge, I think...

The main problem is that now if I want to merge the up-to-date
andy-tracking branch into debian I am prompted with another manual merge
for too many files.  I am sure that this is caused by me manually
merging andy-tracking before [1]: indeed the debian branch has now
diverged from both upstream stable and andy-tracking one (the output of
`git status` is available at Debian bug #518008 [2]).  Moreover, the
debian branch does not contain the corresponding upstream tag (again, my
fault).

[1] http://lists.linuxtogo.org/pipermail/smartphones-userland/2009-February/001075.html
[2] http://bugs.debian.org/518008

From `git merge --help` I cannot see any force option, i.e. something
meaning "I do not care about the current branch, just merge everything
From the remote one".  Or maybe I failed to correctly read the manpage.

Thus, I solved it merging "again" the andy-tracking branch I manually
merged the first time: this resulted in a successful merge, plus an
advice to run `git prune`.  And now I can go on :-)

> Do you still want to continue with the andy-tracking branch? ;)

Yes, because I fear that in the future the situation above will appear
again.

Thx, bye,
Gismo / Luca
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 314 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-fso-maint/attachments/20090306/41076094/attachment.pgp