From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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,
Alim Akhtar <alim.akhtar@samsung.com>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree
Date: Wed, 02 Mar 2016 08:20:30 +0900 [thread overview]
Message-ID: <56D623BE.3050303@samsung.com> (raw)
In-Reply-To: <20160302091450.6b1463bf@canb.auug.org.au>
On 02.03.2016 07:14, Stephen Rothwell wrote:
> Hi Krzysztof,
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> efdda175c07f ("arm64: defconfig: add spmi and usb related configs")
>
> from the arm-soc tree and commit:
>
> 617fe7196d54 ("arm64: defconfig: Enable exynos thermal config")
> 6bb837189388 ("arm64: defconfig: Enable Samsung MFD and related configs")
>
> from the samsung-krzk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
Yeah, that was expected... Thanks for the fix, looks fine from Samsung's
side.
Best regards,
Krzysztof
WARNING: multiple messages have this Message-ID (diff)
From: k.kozlowski@samsung.com (Krzysztof Kozlowski)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree
Date: Wed, 02 Mar 2016 08:20:30 +0900 [thread overview]
Message-ID: <56D623BE.3050303@samsung.com> (raw)
In-Reply-To: <20160302091450.6b1463bf@canb.auug.org.au>
On 02.03.2016 07:14, Stephen Rothwell wrote:
> Hi Krzysztof,
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> efdda175c07f ("arm64: defconfig: add spmi and usb related configs")
>
> from the arm-soc tree and commit:
>
> 617fe7196d54 ("arm64: defconfig: Enable exynos thermal config")
> 6bb837189388 ("arm64: defconfig: Enable Samsung MFD and related configs")
>
> from the samsung-krzk tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
Yeah, that was expected... Thanks for the fix, looks fine from Samsung's
side.
Best regards,
Krzysztof
next prev parent reply other threads:[~2016-03-01 23:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 22:14 linux-next: manual merge of the samsung-krzk tree with the arm-soc tree Stephen Rothwell
2016-03-01 22:14 ` Stephen Rothwell
2016-03-01 22:14 ` Stephen Rothwell
2016-03-01 23:20 ` Krzysztof Kozlowski [this message]
2016-03-01 23:20 ` Krzysztof Kozlowski
-- strict thread matches above, loose matches on Subject: below --
2016-06-06 0:06 Stephen Rothwell
2016-06-06 0:06 ` Stephen Rothwell
2016-06-06 0:06 ` Stephen Rothwell
[not found] <CGME20160916085054eucas1p261bf6f0fb00e860fb819139557ffe5bb@eucas1p2.samsung.com>
2016-09-05 1:19 ` Stephen Rothwell
2016-09-05 1:19 ` Stephen Rothwell
2016-09-16 8:50 ` Krzysztof Kozlowski
2016-09-16 8:50 ` Krzysztof Kozlowski
2019-06-24 23:59 Stephen Rothwell
2019-06-24 23:59 ` Stephen Rothwell
2019-06-24 23:59 ` Stephen Rothwell
2019-06-24 23:59 ` Stephen Rothwell
2019-06-25 0:03 Stephen Rothwell
2019-06-25 0:03 ` Stephen Rothwell
2022-01-31 22:53 Stephen Rothwell
2022-01-31 22:53 ` Stephen Rothwell
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=56D623BE.3050303@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=alim.akhtar@samsung.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=srinivas.kandagatla@linaro.org \
/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.