Re: Signal patchset

Geert Uytterhoeven
2011-01-07T13:21:35Z

On Sat, Jan 1, 2011 at 20:40, Thorsten Glaser <tg@mirbsd.de> wrote:
>>FWIW, there's an m68knommu counterpart (ACKed by gerg a while ago).  The
>>entire bunch is on ftp.linux.org.uk/pub/people/viro/m68k-signals - both m68k
>>and m68knommu sets.
>
> I’ve made it apply on top of the current m68k-queue (I thought
> I’d learn why people think git makes merging patches easy… well,
> in the end, I got a result, but it was everything but). Attached.

It's a bit tricky as threadinfo_*.h got merged, so I ended up editing the
patch series manually.

Anyway, you want to either use `git am -3' or apply it to the original version
it was made for, and `git cherry-pick' or `git-rebase --onto' it to
move it to the current
version. Caveat: my git incorrectly applied one part to an h8300
include instead,
as it missed one rename.

In the end, I got the exact same result as you did, so it must be correct ;-)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds