lkml.org 
[lkml]   [2015]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL 5/7] ARM: SoC driver updates
From
On Tue, Feb 17, 2015 at 9:41 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> arch/arm/boot/dts/rk3288.dtsi: add/add: Keep both sides
> ...
>
> You mixed up the aliases of this pull and the previous DT pull.
>
> Not a real problem, but while resolving the DT aliases (which you
> claimed had "No conflicts") I was wondering just what you had been
> doing..

Whoops, sorry for that. I took merge conflict notes in a separate
window and copied and pasted, and did it into the wrong email.


-Olof


\
 
 \ /
  Last update: 2015-02-17 19:21    [W:0.062 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site