Messages in this thread | | | Date | Sun, 26 Feb 2012 23:05:23 -0500 (EST) | Subject | Re: linux-next: manual merge of the net-next tree with Linus' tree | From | David Miller <> |
| |
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!
| |