linux-next: manual merge of the net-next tree with Linus' tree

Hi all,

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/sfc/rx.c
index fc52fca,506d246..0000000

--- a/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c

@@@ -156,10 -155,11 +155,10 @@@ static int efx_init_rx_buffers_skb(stru
  		if (unlikely(!skb))
  			return -ENOMEM;
  
 -		/* Adjust the SKB for padding and checksum */
 +		/* Adjust the SKB for padding */
  		skb_reserve(skb, NET_IP_ALIGN);
  		rx_buf->len = skb_len - NET_IP_ALIGN;
- 		rx_buf->is_page = false;
+ 		rx_buf->flags = 0;
 -		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
  		rx_buf->dma_addr = pci_map_single(efx->pci_dev,
  						  skb->data, rx_buf->len,
@@@ -493,9 -494,8 +493,9 @@@ static void efx_rx_packet_gro(struct ef
  	} else {
  		struct sk_buff *skb = rx_buf->u.skb;
  
- 		EFX_BUG_ON_PARANOID(!checksummed);
+ 		EFX_BUG_ON_PARANOID(!(rx_buf->flags & EFX_RX_PKT_CSUMMED));
  		rx_buf->u.skb = NULL;
 +		skb->ip_summed = CHECKSUM_UNNECESSARY;
  
  		gro_result = napi_gro_receive(napi, skb);
  	}

From: Stephen Rothwell <redacted>
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!

On Sun, 2012-02-26 at 23:05 -0500, David Miller wrote:

From: Stephen Rothwell <redacted>
Date: Mon, 27 Feb 2012 12:11:25 +1100

quoted

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.

Thank you both.  I should have flagged this when sending the change for
the net tree.

Ben.

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.