lkml.org 
[lkml]   [2013]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL 00/09] arm-soc: changes for 3.9
From
On Thu, Feb 21, 2013 at 1:12 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> The merge conflicts I mention in the tags are all for conflicts
> between the arm-soc branches. There are a few more conflicts
> with other stuff you already pulled, but it all looks simple
> as well. I have uploaded a 'for-linus' branch to the arm-soc
> tree with the resolutions I used.

You also had some extra stuff in that branch, but apart from that, I
think our resolutions are identical except for trivial include file
ordering and whitespace.

But you should check, since I don't cross-compile the arm stuff..

Linus


\
 
 \ /
  Last update: 2013-02-22 02:41    [W:0.082 / U:0.256 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site