Messages in this thread | | | Date | Sun, 2 Jun 2013 21:39:38 +0200 | Subject | Re: Exotic architecture fixes | From | Geert Uytterhoeven <> |
| |
On Tue, May 28, 2013 at 11:38 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, May 23, 2013 at 10:09 PM, Geert Uytterhoeven > <geert@linux-m68k.org> wrote: >> I created a branch where I collected several exotic architecture fixes >> (and a few >> other trivial fixes): >> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git exotic-arch-fixes >> >> Several of these have been ack'ed (cfr. *-indicators below). >> If you reject any of the commits, please scream. >> If you want to take any of them yourself, please do so. >> >> I intend to merge this into my for-next branch after the release of v3.10-rc4, >> and ask Linus to pull after the release of v3.10-rc5.
I merged this in the for-next branch of my repo.
>> Geert Uytterhoeven (32): >> cris: Switch cris to drivers/Kconfig > > JFYI, this has a trivial conflict with "CRIS: drop unused Kconfig symbols" > in -next.
Stephen: cris/for-next and m68k/for-next removed two different hunks from arch/cris/arch-v32/drivers/Kconfig. To resolve the conflict, just remove both. Thanks!
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
| |