Hi Geert, [Chen Liqin <liqin.c...@sunplusct.com> removed from cc as that domain appears to not work :-(]
On Sun, 2 Jun 2013 21:39:38 +0200 Geert Uytterhoeven <ge...@linux-m68k.org> wrote: > > On Tue, May 28, 2013 at 11:38 AM, Geert Uytterhoeven > <ge...@linux-m68k.org> wrote: > > On Thu, May 23, 2013 at 10:09 PM, Geert Uytterhoeven > > <ge...@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. Surely, your for-linus branch would have been a better choice. And then maybe merge that into your for-next branch if you really needed these fixes to continue with m68k work? > >> 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! Thanks, fixed it up. -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpZ1ixNN0Fs7.pgp
Description: PGP signature
