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

drivers/net/ethernet/freescale/fec.h
  7d650df99d52 ("net: fec: add pm_qos support on imx6q platform")
  40c79ce13b03 ("net: fec: add stop mode support for imx8 platform")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec.h
index 68bc16058bae873a7f0428b3852973479824c20e,d77ee8936c6a3a0709132b6129adb7ca3a0ef4f7..99cfe6ab41fca2e7ab2ca79a19edaefdf25ace26
--- 1/drivers/net/ethernet/freescale/fec.h
--- 2/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@@ -16,10 -16,9 +16,11 @@@
  
  #include <linux/clocksource.h>
  #include <linux/net_tstamp.h>
+ #include <linux/pm_qos.h>
  #include <linux/ptp_clock_kernel.h>
  #include <linux/timecounter.h>
 +#include <dt-bindings/firmware/imx/rsrc.h>
 +#include <linux/firmware/imx/sci.h>
  
  #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
      defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_ptp.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_base.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_ppe.h
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc include/linux/ieee80211.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/seg6.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/sched/sch_sfb.c
Simple merge