From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Kukjin Kim <kgene.kim@samsung.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Nicolas Ferre <nicolas.ferre@atmel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Lee Jones <lee.jones@linaro.org>,
Maxime Coquelin <maxime.coquelin@st.com>,
Baruch Siach <baruch@tkos.co.il>,
Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Subject: Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees
Date: Wed, 20 May 2015 11:16:46 +0200 [thread overview]
Message-ID: <20150520091646.GF3338@piout.net> (raw)
In-Reply-To: <CAJKOXPdsi-5kdQJtybeaMCy0DXuRTRGgBEOM=SH9BsjquEMjCQ@mail.gmail.com>
On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote :
> 2015-05-20 9:27 GMT+09:00 Stephen Rothwell <sfr@canb.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.
>
Hum, last time I asked, we were not supposed to do a savedefconfig on
multi_v7...
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
WARNING: multiple messages have this Message-ID (diff)
From: alexandre.belloni@free-electrons.com (Alexandre Belloni)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees
Date: Wed, 20 May 2015 11:16:46 +0200 [thread overview]
Message-ID: <20150520091646.GF3338@piout.net> (raw)
In-Reply-To: <CAJKOXPdsi-5kdQJtybeaMCy0DXuRTRGgBEOM=SH9BsjquEMjCQ@mail.gmail.com>
On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote :
> 2015-05-20 9:27 GMT+09:00 Stephen Rothwell <sfr@canb.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.
>
Hum, last time I asked, we were not supposed to do a savedefconfig on
multi_v7...
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2015-05-20 9:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 0:27 linux-next: manual merge of the samsung tree with the arm-soc and at91 trees Stephen Rothwell
2015-05-20 0:27 ` Stephen Rothwell
2015-05-20 0:27 ` Stephen Rothwell
2015-05-20 0:35 ` Krzysztof Kozlowski
2015-05-20 0:35 ` Krzysztof Kozlowski
2015-05-20 9:16 ` Alexandre Belloni [this message]
2015-05-20 9:16 ` Alexandre Belloni
2015-05-20 9:47 ` Geert Uytterhoeven
2015-05-20 9:47 ` Geert Uytterhoeven
2015-05-21 1:20 ` Krzysztof Kozlowski
2015-05-21 1:20 ` Krzysztof Kozlowski
2015-05-21 3:29 ` linux-next: manual merge of the samsung tree with the arm-soc andat91 trees Kukjin Kim
2015-05-21 3:29 ` Kukjin Kim
2015-05-20 7:45 ` linux-next: manual merge of the samsung tree with the arm-soc and at91 trees Nicolas Ferre
2015-05-20 7:45 ` Nicolas Ferre
2015-05-20 7:45 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150520091646.GF3338@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=baruch@tkos.co.il \
--cc=geert+renesas@glider.be \
--cc=javier.martinez@collabora.co.uk \
--cc=k.kozlowski@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.coquelin@st.com \
--cc=nicolas.ferre@atmel.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.