[lkml]   [2014]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the keystone tree with the arm-soc tree
On Monday 24 March 2014 09:23 PM, Balbi, Felipe wrote:
> On Mon, Mar 24, 2014 at 08:00:03PM -0400, Santosh Shilimkar wrote:
>> On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote:
>>> Hi Santosh,
>>> Today's linux-next merge of the keystone tree got a conflict in
>>> arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move
>>> kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit
>>> 400550ae7e77 ("ARM: dts: Build all keystone dt blobs") from the keystone
>>> tree.
>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>> is required).
>> Looks fine. Thanks
> wow, not even a mention of my original patch [1]. I also couldn't find
> your patch [2] anywhere in the mailing list archives, not even google
> could find it. The only place that commit was ever mentioned was this
> very thread.
I thought, we closed the thread mentioning about the patch applied
on the same thread. [1]

> The patch I wrote was valid for v3.14-rc7 (the base where it was
> written), I'd expect to, at a minimum, have a mention or a Reported-by
> or at least see your patch in the mailing list.
> Anyway, it's just a patch. Nevermind.
I missed to add the reported-by tag and also should have just pasted
the patch in the reply. Sorry about that.



 \ /
  Last update: 2014-03-25 15:01    [W:0.268 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site