[lkml]   [2011]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [GIT] Networking
    On Tue, Oct 25, 2011 at 01:46:11PM +0200, Linus Torvalds wrote:
    > Anyway, after that rant about really bad practices, let me say that I
    > did fix up the conflict and I think it's right. But I won't guarantee
    > it, so please check the changes to fs/sysfs/dir.c.

    I think it looks ok, I've booted the merge result, and am typing and
    sending this from the new kernel, and it hasn't crashed yet :)

    greg k-h

     \ /
      Last update: 2011-10-25 15:15    [W:0.023 / U:106.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site