lkml.org 
[lkml]   [2006]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [discuss] Re: Please pull x86-64 bug fixes
    Date
    On Friday 06 October 2006 00:59, Linus Torvalds wrote:
    >
    > On Thu, 5 Oct 2006, Andi Kleen wrote:
    > >
    > > Ok. Please drop them then.
    >
    > Ok, done. Since they weren't the last commits in your branch, I had to do
    > a certain amount of hand-waving: I merged up to the commit preceding the
    > AC flag changes, and then I cherry-picked the one later commit separately.
    >
    > So it's not a normal merge, since I wanted to avoid those two commits.
    >
    > I've pushed out the result, you should check it out

    Looks good thanks.

    > (and drop the top
    > three commits on your head once you're ok with my result, since they won't
    > exist in my tree).

    I only use temporary merge trees from quilt anyways, so it's fine
    for me.

    -Andi
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-06 01:07    [W:0.021 / U:0.484 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site