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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/igb/igb_main.c between commit f9d40f6a9921
("igb: Revert support for build_skb in igb") from Linus' tree and commit
b980ac18c95f ("igb: Fix code comments and whitespace") from the net-next
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
index 64f7529,9bf08b9..0000000
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@@ -3350,11 -3387,25 +3387,11 @@@ void igb_configure_rx_ring(struct igb_a
  	wr32(E1000_RXDCTL(reg_idx), rxdctl);
  }
  
 -static void igb_set_rx_buffer_len(struct igb_adapter *adapter,
 -				  struct igb_ring *rx_ring)
 -{
 -#define IGB_MAX_BUILD_SKB_SIZE \
 -	(SKB_WITH_OVERHEAD(IGB_RX_BUFSZ) - \
 -	 (NET_SKB_PAD + NET_IP_ALIGN + IGB_TS_HDR_LEN))
 -
 -	/* set build_skb flag */
 -	if (adapter->max_frame_size <= IGB_MAX_BUILD_SKB_SIZE)
 -		set_ring_build_skb_enabled(rx_ring);
 -	else
 -		clear_ring_build_skb_enabled(rx_ring);
 -}
 -
  /**
-  * igb_configure_rx - Configure receive Unit after Reset
-  * @adapter: board private structure
+  *  igb_configure_rx - Configure receive Unit after Reset
+  *  @adapter: board private structure
   *
-  * Configure the Rx unit of the MAC after a reset.
+  *  Configure the Rx unit of the MAC after a reset.
   **/
  static void igb_configure_rx(struct igb_adapter *adapter)
  {
@@@ -3365,12 -3416,16 +3402,13 @@@
  
  	/* set the correct pool for the PF default MAC address in entry 0 */
  	igb_rar_set_qsel(adapter, adapter->hw.mac.addr, 0,
- 	                 adapter->vfs_allocated_count);
+ 			 adapter->vfs_allocated_count);
  
  	/* Setup the HW Rx Head and Tail Descriptor Pointers and
- 	 * the Base and Length of the Rx Descriptor Ring */
+ 	 * the Base and Length of the Rx Descriptor Ring
+ 	 */
 -	for (i = 0; i < adapter->num_rx_queues; i++) {
 -		struct igb_ring *rx_ring = adapter->rx_ring[i];
 -		igb_set_rx_buffer_len(adapter, rx_ring);
 -		igb_configure_rx_ring(adapter, rx_ring);
 -	}
 +	for (i = 0; i < adapter->num_rx_queues; i++)
 +		igb_configure_rx_ring(adapter, adapter->rx_ring[i]);
  }
  
  /**
@@@ -6688,9 -6808,17 +6716,9 @@@ static bool igb_alloc_mapped_page(struc
  	return true;
  }
  
 -static inline unsigned int igb_rx_offset(struct igb_ring *rx_ring)
 -{
 -	if (ring_uses_build_skb(rx_ring))
 -		return NET_SKB_PAD + NET_IP_ALIGN;
 -	else
 -		return 0;
 -}
 -
  /**
-  * igb_alloc_rx_buffers - Replace used receive buffers; packet split
-  * @adapter: address of board private structure
+  *  igb_alloc_rx_buffers - Replace used receive buffers; packet split
+  *  @adapter: address of board private structure
   **/
  void igb_alloc_rx_buffers(struct igb_ring *rx_ring, u16 cleaned_count)
  {
@@@ -6710,11 -6838,12 +6738,10 @@@
  		if (!igb_alloc_mapped_page(rx_ring, bi))
  			break;
  
- 		/*
- 		 * Refresh the desc even if buffer_addrs didn't change
+ 		/* Refresh the desc even if buffer_addrs didn't change
  		 * because each write-back erases this info.
  		 */
 -		rx_desc->read.pkt_addr = cpu_to_le64(bi->dma +
 -						     bi->page_offset +
 -						     igb_rx_offset(rx_ring));
 +		rx_desc->read.pkt_addr = cpu_to_le64(bi->dma + bi->page_offset);
  
  		rx_desc++;
  		bi++;

Attachment: pgp00000.pgp
Description: PGP signature