linux-kernel - Re: merge of m68knommu and m68k arch branches?

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: <AANLkTimtr0JbmM2PNtGRyAKE7kNr_FXd==ZC3bM82xsG@mail.gmail.com>
Date:	Mon, 21 Feb 2011 08:41:24 +0100
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	Greg Ungerer <gerg@...pgear.com>
Cc:	"Linux/m68k" <linux-m68k@...r.kernel.org>,
	Linux Kernel Development <linux-kernel@...r.kernel.org>,
	Steven King <sfking00@...oo.com>,
	uClinux development list <uclinux-dev@...inux.org>,
	Greg Ungerer <gerg@...inux.org>,
	Greg Ungerer <gregungerer@...tnet.com.au>
Subject: Re: merge of m68knommu and m68k arch branches?

On Mon, Feb 21, 2011 at 00:53, Greg Ungerer <gerg@...pgear.com> wrote:
> On 19/02/11 18:39, Geert Uytterhoeven wrote:
>>
>> On Fri, Feb 18, 2011 at 23:12, Greg Ungerer<gerg@...pgear.com>  wrote:
>>>
>>> On 19/02/11 01:24, Geert Uytterhoeven wrote:
>>>>
>>>> On Fri, Feb 18, 2011 at 12:27, Geert Uytterhoeven<geert@...ux-m68k.org>
>>>>  wrote:
>>>>>
>>>>> On Fri, Feb 18, 2011 at 01:07, Greg Ungerer<gerg@...pgear.com>
>>>>>  wrote:
>>>>>>
>>>>>> I would like to put up for discussion a merge of the m68knommu and
>>>>>> m68k arch branches.
>>>>>>
>>>>>> Attached is a script and patch that does a kind of brute force
>>>>>> simplistic merge of the directories and files. (Thanks to Stephen King
>>>>>> <sfking@...dc.com>    for the initial version of this script, and to
>>>>>> Sam Ravnborg for the m68k includes merge script this was based on).
>>>>>> Nothing outside of the arch/m68k and arch/m68knommu directories is
>>>>>> touched, and in the end there is no more arch/m68knommu. To apply you
>>>>>> simply run the script from the top of a current kernel git tree (I
>>>>>> used
>>>>>> 2.6.38-rc5 for testing) and then apply the patch.
>>>>>
>>>>> Building...
>>>>
>>>> Builds fine (all test configs), runs on ARAnyM.
>>>>
>>>> Let's go ahead?
>>>
>>> What sort of timing do you think makes sense?
>>> Is for 2.6.39 too soon?
>>
>> Personally, I don't mind. 2.6.39 is OK for me. I guess the safest way
>> is to let Linus
>> execute the script? Before or after the merge window?
>
> Well I was going to construct the merge as a single git commit
> (which is equivalent to running this script and applying the patch).
> Linus would then just pull this.
>
> The best timing for me is near the end of the merge window.
> That way we can both get in any other changes first.

Sounds like a plan, OK!

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/