Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/e1000_mac.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe.h
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc net/core/filter.c
index 78a636e60a0b182061358a068c2c2ed4d36051cb,9d79ca0a6e8e93e1bfc6d92c8a154a96ae0681c6..7c4db3dd3d1e45cadfaf4b67351ac6284a9e4408
--- 1/net/core/filter.c
--- 2/net/core/filter.c
+++ b/net/core/filter.c
@@@ -643,19 -652,6 +652,12 @@@ static u64 __get_raw_cpu_id(u64 ctx, u6
        return raw_smp_processor_id();
  }
  
- /* Register mappings for user programs. */
- #define A_REG         0
- #define X_REG         7
- #define TMP_REG               8
- #define ARG2_REG      2
- #define ARG3_REG      3
- 
 +/* note that this only generates 32-bit random numbers */
 +static u64 __get_random_u32(u64 ctx, u64 A, u64 X, u64 r4, u64 r5)
 +{
 +      return (u64)prandom_u32();
 +}
 +
  static bool convert_bpf_extensions(struct sock_filter *fp,
                                   struct sock_filter_int **insnp)
  {