lkml.org 
[lkml]   [2009]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the sysctl tree with the net tree
    Hi Eric,

    Today's linux-next merge of the sysctl tree got a conflict in
    kernel/sysctl_check.c between commit
    8153a10c08f1312af563bb92532002e46d3f504a ("ipv4: add sysctl to accept
    packets with local source addresses") from the net tree and commit
    83ac201b4f06eb8aeb7ac93cf162651ba30e0b28 ("sysctl: Remove dead code from
    sysctl_check") from the sysctl tree.

    The latter removes the need for the former to change this file. I just
    used the latter.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2009-12-04 09:39    [W:0.020 / U:36.608 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site