lkml.org 
[lkml]   [2012]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [GIT PULL v2] ARM: arm-soc fixes for 3.8
    From
    [proper reply-to-all this time]

    On Thu, Dec 20, 2012 at 8:49 AM, Linus Torvalds
    <torvalds@linux-foundation.org> wrote:
    > On Thu, Dec 20, 2012 at 8:38 AM, Olof Johansson <olof@lixom.net> wrote:
    >>
    >> One of the sunxi patches from the last pull request was misapplied (I
    >> realized what happened -- git am -s didn't apply cleanly so I had done it
    >> through regular patch, thus not catching the renames properly). Here's
    >> a fresh version of the pull request with a couple more OMAP and Samsung
    >> patches included.
    >
    > Argh!
    >
    > I pulled your earlier branch due to Tony's ack, and now you're
    > re-created that branch with new pulls (effectively rebasing it).
    >
    > Don't do things like this to me.

    Yeah, sorry about that -- I wanted to replace the broken patch, and
    Tony's branch was based on a newer version of your tree so I brought
    everything forward as I had to rebase anyway.

    I'll rebuild on top of what you've pulled, and send a fresh request of
    just the delta. Sorry about the race condition here.


    -Olof


    \
     
     \ /
      Last update: 2012-12-20 19:01    [W:2.387 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site