linux-kernel - Re: Exotic architecture fixes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMuHMdV5t3BGNYNzCyEH-dYikAtEr2A+BckPi9QtgAUEJDMM0w@mail.gmail.com>
Date:	Sun, 2 Jun 2013 21:39:38 +0200
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Al Viro <viro@...iv.linux.org.uk>,
	David Howells <dhowells@...hat.com>,
	Yoshinori Sato <ysato@...rs.sourceforge.jp>,
	Hans-Christian Egtvedt <egtvedt@...fundet.no>,
	Chen Liqin <liqin.chen@...plusct.com>,
	Lennox Wu <lennox.wu@...il.com>, linux-c6x-dev@...ux-c6x.org,
	Cris <linux-cris-kernel@...s.com>, linux@...ts.openrisc.net,
	Håvard Skinnemoen <hskinnemoen@...il.com>,
	Arnd Bergmann <arnd@...db.de>
Subject: Re: Exotic architecture fixes

On Tue, May 28, 2013 at 11:38 AM, Geert Uytterhoeven
<geert@...ux-m68k.org> wrote:
> On Thu, May 23, 2013 at 10:09 PM, Geert Uytterhoeven
> <geert@...ux-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@...ux-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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/