linux-kernel - Re: linux-next: manual merge of the m68knommu tree with the m68k tree

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] [day] [month] [year] [list]

Message-ID: <CAMuHMdW6qo2-Rg1vdB4_QMYTbhKyAFTiamy4z1zYhf0uQZB3-Q@mail.gmail.com>
Date:	Wed, 9 Nov 2011 09:19:47 +0100
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	Greg Ungerer <gerg@...pgear.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree

Hi Greg,

On Wed, Nov 9, 2011 at 08:37, Greg Ungerer <gerg@...pgear.com> wrote:
> On 11/09/2011 05:13 PM, Geert Uytterhoeven wrote:
>> On Wed, Nov 9, 2011 at 08:08, Greg Ungerer<gerg@...pgear.com>  wrote:
>>>
>>> On 11/09/2011 10:15 AM, Stephen Rothwell wrote:
>>>>
>>>> Today's linux-next merge of the m68knommu tree got a conflict in
>>>> arch/m68k/Kconfig between commit d890d7399525 ("m68k/irq: Remove
>>>> obsolete
>>>> m68k irq framework") from the m68k tree and commit 4e8a9e70dfe8 ("m68k:
>>>> selection of GENERIC_ATOMIC64 is not MMU specific") from the m68knommu
>>>> tree.
>>>>
>>>> Just context changes. Ã¡I fixed it up (see below) and can carry the fix
>>>> as
>>>> necessary.
>>>
>>> Thanks. Both this and the previous m68k merge conflict patch look good.
>>>
>>> Geert: would you prefer I hold off on these 2 patches until after
>>> you merge your IRQ changes?
>>
>> I'll ask Linus to pull them today or tomorrow. After that (and he has
>> pulled), you can
>> rebase your tree. Is that OK for you?
>
> Yep, that is good. I wasn't sure if you where looking to push them
> in rc1 or in the next merge window.

rc2. I didn't want to rebase them to a random point between 3.1 and rc1.

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/