[lkml]   [2012]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the kmap_atomic tree with the tree
    On Wed, 2012-02-08 at 15:10 +1100, Stephen Rothwell wrote:
    > Hi Cong,
    > Today's linux-next merge of the kmap_atomic tree got a conflict in
    > drivers/net/ethernet/intel/e1000e/netdev.c between commit 0e15df490eef
    > ("e1000e: minor whitespace and indentation cleanup") from the net-next
    > tree and commit 2b4ba510a572 ("net: remove the second argument of k
    > [un]map_atomic()") from the kmap_atomic tree.
    > I fixed it up (see below) and can carry the fix as necessary.

    Hi, Stephen,

    Looks good, thanks!

     \ /
      Last update: 2012-02-08 10:33    [W:0.018 / U:40.208 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site