Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1347095
| From | Krzysztof Kozlowski <k.kozlowski@samsung.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree |
| Date | 2016-03-02 00:30 +0100 |
| Message-ID | <r81TQ-7Bj-33@gated-at.bofh.it> (permalink) |
| References | <r80O6-6VE-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: manual merge of the samsung-krzk tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-01 23:20 +0100 Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-03-02 00:30 +0100
csiph-web