[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAMuHMdVoot1mBHUmGMuTzCkxzd7H5TJThrwmPvnedFAOAP49pw@mail.gmail.com>
Date: Wed, 20 May 2015 11:47:45 +0200
From: Geert Uytterhoeven <geert@...ux-m68k.org>
To: Alexandre Belloni <alexandre.belloni@...e-electrons.com>
Cc: Krzysztof Kozlowski <k.kozlowski@...sung.com>,
Stephen Rothwell <sfr@...b.auug.org.au>,
Kukjin Kim <kgene.kim@...sung.com>,
Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
Nicolas Ferre <nicolas.ferre@...el.com>,
Linux-Next <linux-next@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Ard Biesheuvel <ard.biesheuvel@...aro.org>,
Geert Uytterhoeven <geert+renesas@...der.be>,
Masahiro Yamada <yamada.masahiro@...ionext.com>,
Lee Jones <lee.jones@...aro.org>,
Maxime Coquelin <maxime.coquelin@...com>,
Baruch Siach <baruch@...s.co.il>,
Javier Martinez Canillas <javier.martinez@...labora.co.uk>
Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc and
at91 trees
On Wed, May 20, 2015 at 11:16 AM, Alexandre Belloni
<alexandre.belloni@...e-electrons.com> wrote:
> On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote :
>> 2015-05-20 9:27 GMT+09:00 Stephen Rothwell <sfr@...b.auug.org.au>:
>> > Today's linux-next merge of the samsung tree got a conflict in
>> > arch/arm/configs/multi_v7_defconfig between various commits from the
>> > arm-soc and at91 trees and various commits from the samsung tree.
>> >
>> > I fixed it up (see below) and can carry the fix as necessary (no action
>> > is required).
>>
>> Hi,
>>
>> Thanks for the merge.
>>
>> The parts coming from samsung-soc related to manually toggling stuff
>> (by me and Javier) look fine. The rest (coming from Kukjin's
>> savedefconfig) I don't know - too much of them.
>>
>
> Hum, last time I asked, we were not supposed to do a savedefconfig on
> multi_v7...
Yeah, IMHO it's something the arm-soc maintainers should do only right
after rc1.
Doing it at any other point in time may remove options that have just been
added to multi_v7_defconfig by an arm-soc submaintainer, and that depend on
a Kconfig change queued in another maintainer's for-next branch.
Personally, I think no arm-soc submaintainer should touch multi_v7_defconfig,
and all changes should be applied by the arm-soc maintainers.
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/
Powered by blists - more mailing lists