lkml.org 
[lkml]   [2012]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: linux-next: manual merge of the net-next tree with Linus' tree
    From

    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Mon, 27 Feb 2012 12:11:25 +1100

    > Today's linux-next merge of the net-next tree got a conflict in
    > drivers/net/ethernet/sfc/rx.c between commit ff3bc1e75275 ("sfc: Fix
    > assignment of ip_summed for pre-allocated skbs") from Linus' tree and
    > commit db3395697cad ("sfc: Replace efx_rx_buffer::is_page and other
    > booleans with a flags field") from the net-next tree.
    >
    > Just context changes. I fixed it up (see below) and can carry the fix as
    > necessary.

    I just merged net into net-next and resolved this conflict.

    Thanks!


    \
     
     \ /
      Last update: 2012-02-27 05:09    [W:4.948 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site