1
0
Fork 0
alistair23-linux/net/dsa
Jason Liu 5691e22711 Merge tag 'v5.4.47' into imx_5.4.y
* tag 'v5.4.47': (2193 commits)
  Linux 5.4.47
  KVM: arm64: Save the host's PtrAuth keys in non-preemptible context
  KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception
  ...

 Conflicts:
	arch/arm/boot/dts/imx6qdl.dtsi
	arch/arm/mach-imx/Kconfig
	arch/arm/mach-imx/common.h
	arch/arm/mach-imx/suspend-imx6.S
	arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
	arch/powerpc/include/asm/cacheflush.h
	drivers/cpufreq/imx6q-cpufreq.c
	drivers/dma/imx-sdma.c
	drivers/edac/synopsys_edac.c
	drivers/firmware/imx/imx-scu.c
	drivers/net/ethernet/freescale/fec.h
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
	drivers/net/phy/phy_device.c
	drivers/perf/fsl_imx8_ddr_perf.c
	drivers/usb/cdns3/gadget.c
	drivers/usb/dwc3/gadget.c
	include/uapi/linux/dma-buf.h

Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
2020-06-19 17:32:49 +08:00
..
Kconfig net: dsa: ocelot: add tagger for Ocelot/Felix switches 2019-12-02 18:04:43 +08:00
Makefile net: dsa: ocelot: add tagger for Ocelot/Felix switches 2019-12-02 18:04:43 +08:00
dsa.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152 2019-05-30 11:26:32 -07:00
dsa2.c Merge tag 'v5.4.47' into imx_5.4.y 2020-06-19 17:32:49 +08:00
dsa_priv.h net: dsa: fix phylink_start()/phylink_stop() calls 2020-03-18 07:17:39 +01:00
master.c net: dsa: Do not leave DSA master with NULL netdev_ops 2020-05-14 07:58:20 +02:00
port.c Merge tag 'v5.4.47' into imx_5.4.y 2020-06-19 17:32:49 +08:00
slave.c net: dsa: declare lockless TX feature for slave ports 2020-06-03 08:21:38 +02:00
switch.c net: dsa: program VLAN on CPU port from slave 2019-08-27 20:17:28 -07:00
tag_8021q.c net: dsa: tag_8021q: replace dsa_8021q_remove_header with __skb_vlan_pop 2020-04-01 11:01:34 +02:00
tag_brcm.c net: dsa: Fix duplicate frames flooded by learning 2020-04-01 11:01:33 +02:00
tag_dsa.c dsa: Cleanup unneeded table and make tag structures static 2019-04-28 19:41:01 -04:00
tag_edsa.c dsa: Cleanup unneeded table and make tag structures static 2019-04-28 19:41:01 -04:00
tag_gswip.c net: dsa: tag_gswip: fix typo in tagger name 2020-01-23 08:22:52 +01:00
tag_ksz.c net: dsa: ksz: Add KSZ8795 tag code 2019-07-30 15:12:50 -07:00
tag_lan9303.c dsa: Cleanup unneeded table and make tag structures static 2019-04-28 19:41:01 -04:00
tag_mtk.c net: dsa: mt7530: fix roaming from DSA user ports 2020-06-03 08:20:43 +02:00
tag_ocelot.c net: dsa: ocelot: add hardware timestamping support for Felix 2019-12-02 18:04:46 +08:00
tag_qca.c net: dsa: tag_qca: Make sure there is headroom for tag 2020-02-24 08:36:22 +01:00
tag_sja1105.c net: dsa: tag_8021q: replace dsa_8021q_remove_header with __skb_vlan_pop 2020-04-01 11:01:34 +02:00
tag_trailer.c dsa: Cleanup unneeded table and make tag structures static 2019-04-28 19:41:01 -04:00