Re: linux-next: manual merge of the kmap_atomic tree with the tree

[Cong Wang]

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!


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