Groups > linux.kernel > #1458327 > unrolled thread

linux-next: please clean up the samsung-krzk tree

Started by	Stephen Rothwell <sfr@canb.auug.org.au>
First post	2016-08-09 02:00 +0200
Last post	2016-08-09 18:20 +0200
Articles	2 — 2 participants

Back to article view | Back to linux.kernel

  linux-next: please clean up the samsung-krzk tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-08-09 02:00 +0200
    Re: linux-next: please clean up the samsung-krzk tree Krzysztof Kozlowski <krzk@kernel.org> - 2016-08-09 18:20 +0200

#1458327 — linux-next: please clean up the samsung-krzk tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Date	2016-08-09 02:00 +0200
Subject	linux-next: please clean up the samsung-krzk tree
Message-ID	<s42CB-8dP-1@gated-at.bofh.it>

Hi Krzysztof,

The samsung-krzk tree
(git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next)
contains just these:

253256f64294 Merge branch 'next/soc' into for-next
b148ebe425aa Merge branch 'next/defconfig64' into for-next
d11d19d93a01 Merge branch 'next/defconfig64' into for-next
cc8b7edeaeff Merge branch 'next/drivers' into for-next
33d1679aeebb Merge branch 'next/dt64' into for-next
c239aef8ed5c Merge branch 'fixes' into for-next
45338b4af16f Merge branch 'next/drivers' into for-next
42628e196937 Merge branch 'next/soc' into for-next
336361e2749d arm64: dts: Fix RTC by providing rtc_src clock
13fc4c900141 Merge branch 'for-v4.8/exynos-mfc' into for-next
c210c51020f2 Merge branch 'for-v4.8/dts-exynos5410-odroid-xu' into for-next
976b260e2989 Merge branch 'fixes-dt' into for-next
279b6fdc5751 Merge branch 'next/defconfig' into for-next
42ba6ffaa300 Merge branch 'next/dt' into for-next
9f1bc73cb9b2 Merge branch 'next/drivers' into for-next
a8c1aef0a08b Merge branch 'next/soc64' into for-next
c39705ddcc6e Merge branch 'next/soc' into for-next
63b9ef3830d1 Merge branch 'fixes' into for-next

and is causing a conflict with mailline.  Please clean it up.

-- 
Cheers,
Stephen Rothwell

[toc] | [next] | [standalone]

#1458904

From	Krzysztof Kozlowski <krzk@kernel.org>
Date	2016-08-09 18:20 +0200
Message-ID	<s4hV0-1tf-23@gated-at.bofh.it>
In reply to	#1458327

On Tue, Aug 09, 2016 at 09:55:05AM +1000, Stephen Rothwell wrote:
> Hi Krzysztof,
> 
> The samsung-krzk tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next)
> contains just these:
> 
> 253256f64294 Merge branch 'next/soc' into for-next
> b148ebe425aa Merge branch 'next/defconfig64' into for-next
> d11d19d93a01 Merge branch 'next/defconfig64' into for-next
> cc8b7edeaeff Merge branch 'next/drivers' into for-next
> 33d1679aeebb Merge branch 'next/dt64' into for-next
> c239aef8ed5c Merge branch 'fixes' into for-next
> 45338b4af16f Merge branch 'next/drivers' into for-next
> 42628e196937 Merge branch 'next/soc' into for-next
> 336361e2749d arm64: dts: Fix RTC by providing rtc_src clock
> 13fc4c900141 Merge branch 'for-v4.8/exynos-mfc' into for-next
> c210c51020f2 Merge branch 'for-v4.8/dts-exynos5410-odroid-xu' into for-next
> 976b260e2989 Merge branch 'fixes-dt' into for-next
> 279b6fdc5751 Merge branch 'next/defconfig' into for-next
> 42ba6ffaa300 Merge branch 'next/dt' into for-next
> 9f1bc73cb9b2 Merge branch 'next/drivers' into for-next
> a8c1aef0a08b Merge branch 'next/soc64' into for-next
> c39705ddcc6e Merge branch 'next/soc' into for-next
> 63b9ef3830d1 Merge branch 'fixes' into for-next
> 
> and is causing a conflict with mailline.  Please clean it up.

Indeed there was a conflict comming from different merge-conflict
resolution between me and arm-soc (which pulls my stuff). Fixed. Sorry
for the trouble.

However the changelog above is mostly correct. This is a common pattern for
arm-soc related repositories. All work is expected to be done in
separate branches so for-next often looks like this.

Best regards,
Krzysztof

[toc] | [prev] | [standalone]

csiph-web

linux-next: please clean up the samsung-krzk tree

Contents

#1458327 — linux-next: please clean up the samsung-krzk tree

#1458904