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

Both conflicts were simple overlapping changes.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>