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: <20130603112859.7a5ad3a2129493c8c5cd0a48@canb.auug.org.au>
Date:	Mon, 3 Jun 2013 11:28:59 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	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>,
	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

Hi Geert,

[Chen Liqin <liqin.chen@...plusct.com> removed from cc as that domain
appears to not work :-(]

On Sun, 2 Jun 2013 21:39:38 +0200 Geert Uytterhoeven <geert@...ux-m68k.org> wrote:
>
> 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.

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                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped