From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: 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
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
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>,
Krzysztof Kozlowski <k.kozlowski.k@gmail.com>,
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 09:45:56 +0200 [thread overview]
Message-ID: <555C3BB4.2000802@atmel.com> (raw)
In-Reply-To: <20150520102743.3d336a73@canb.auug.org.au>
Le 20/05/2015 02:27, Stephen Rothwell a écrit :
> 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).
AT91 part seems okay. Thanks,
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: nicolas.ferre@atmel.com (Nicolas Ferre)
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 09:45:56 +0200 [thread overview]
Message-ID: <555C3BB4.2000802@atmel.com> (raw)
In-Reply-To: <20150520102743.3d336a73@canb.auug.org.au>
Le 20/05/2015 02:27, Stephen Rothwell a ?crit :
> 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).
AT91 part seems okay. Thanks,
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: 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>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Alexandre Belloni" <alexandre.belloni@free-electrons.com>,
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>,
Krzysztof Kozlowski <k.kozlowski.k@gmail.com>,
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 09:45:56 +0200 [thread overview]
Message-ID: <555C3BB4.2000802@atmel.com> (raw)
In-Reply-To: <20150520102743.3d336a73@canb.auug.org.au>
Le 20/05/2015 02:27, Stephen Rothwell a écrit :
> 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).
AT91 part seems okay. Thanks,
--
Nicolas Ferre
next prev parent reply other threads:[~2015-05-20 7:46 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
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 ` Nicolas Ferre [this message]
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
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=555C3BB4.2000802@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=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.k@gmail.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=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.