[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJKOXPdsi-5kdQJtybeaMCy0DXuRTRGgBEOM=SH9BsjquEMjCQ@mail.gmail.com>
Date: Wed, 20 May 2015 09:35:36 +0900
From: Krzysztof Kozlowski <k.kozlowski@...sung.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Kukjin Kim <kgene.kim@...sung.com>,
Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
linux-arm-kernel@...ts.infradead.org,
Nicolas Ferre <nicolas.ferre@...el.com>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
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
2015-05-20 9:27 GMT+09:00 Stephen Rothwell <sfr@...b.auug.org.au>:
> Hi Kukjin,
>
> 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.
On the other hand I wonder if savedefconfig was done on 4.1-rc1 (base
of branch samsung-defconfig [0]). If yes then it would discard any
Kconfig changes (like new dependencies and symbols) done in for-next
of arm-soc tree.
[0] https://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/log/?h=samsung-defconfig
Best regards,
Krzysztof
--
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