drivers/block/rnbd/Makefile | 6 +-
drivers/block/rnbd/rnbd-common.c | 23 -
drivers/block/rnbd/rnbd-proto.h | 14 +-
drivers/crypto/marvell/octeontx2/Makefile | 11 +-
drivers/crypto/marvell/octeontx2/cn10k_cpt.c | 9 +-
drivers/crypto/marvell/octeontx2/cn10k_cpt.h | 2 -
.../marvell/octeontx2/otx2_cpt_common.h | 2 -
.../marvell/octeontx2/otx2_cpt_mbox_common.c | 14 +-
drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 11 +
.../marvell/octeontx2/otx2_cptpf_main.c | 2 +
.../marvell/octeontx2/otx2_cptvf_main.c | 2 +
drivers/edac/Kconfig | 11 +-
drivers/edac/Makefile | 7 +-
drivers/edac/i10nm_base.c | 2 +
drivers/edac/skx_base.c | 2 +
drivers/edac/skx_common.c | 21 +-
drivers/edac/skx_common.h | 4 +-
drivers/gpu/drm/bridge/imx/Makefile | 4 -
drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 221 -----
drivers/gpu/drm/bridge/imx/imx-ldb-helper.h | 213 +++-
.../imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c} | 0
.../imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c} | 0
drivers/mfd/Kconfig | 8 +-
drivers/mfd/Makefile | 3 +-
drivers/mfd/{rsmu_core.c => rsmu-core.c} | 3 +
drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c} | 0
drivers/mfd/{rsmu_spi.c => rsmu-spi.c} | 0
drivers/mtd/tests/Makefile | 17 +-
drivers/mtd/tests/mtd_test.c | 9 +
drivers/mtd/tests/nandbiterrs.c | 2 +
drivers/mtd/tests/oobtest.c | 2 +
drivers/mtd/tests/pagetest.c | 2 +
drivers/mtd/tests/readtest.c | 2 +
drivers/mtd/tests/speedtest.c | 2 +
drivers/mtd/tests/stresstest.c | 2 +
drivers/mtd/tests/subpagetest.c | 2 +
drivers/mtd/tests/torturetest.c | 2 +
drivers/net/dsa/ocelot/Kconfig | 18 +-
drivers/net/dsa/ocelot/Makefile | 12 +-
drivers/net/dsa/ocelot/felix.c | 6 +
drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +
drivers/net/dsa/ocelot/seville_vsc9953.c | 2 +
drivers/net/ethernet/cavium/Kconfig | 5 +
drivers/net/ethernet/cavium/liquidio/Makefile | 4 +-
.../cavium/liquidio/cn23xx_pf_device.c | 4 +
.../cavium/liquidio/cn23xx_vf_device.c | 3 +
.../ethernet/cavium/liquidio/cn66xx_device.c | 1 +
.../ethernet/cavium/liquidio/cn68xx_device.c | 1 +
.../net/ethernet/cavium/liquidio/lio_core.c | 16 +
.../ethernet/cavium/liquidio/lio_ethtool.c | 1 +
.../ethernet/cavium/liquidio/octeon_device.c | 24 +
.../ethernet/cavium/liquidio/octeon_droq.c | 4 +
.../ethernet/cavium/liquidio/octeon_mem_ops.c | 5 +
.../net/ethernet/cavium/liquidio/octeon_nic.c | 3 +
.../cavium/liquidio/request_manager.c | 14 +
.../cavium/liquidio/response_manager.c | 3 +
drivers/net/ethernet/freescale/dpaa2/Kconfig | 6 +
drivers/net/ethernet/freescale/dpaa2/Makefile | 6 +-
.../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +
.../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 15 +-
.../ethernet/freescale/dpaa2/dpaa2-switch.c | 2 +
drivers/net/ethernet/freescale/enetc/Kconfig | 5 +
drivers/net/ethernet/freescale/enetc/Makefile | 7 +-
drivers/net/ethernet/freescale/enetc/enetc.c | 21 +
.../net/ethernet/freescale/enetc/enetc_cbdr.c | 7 +
.../ethernet/freescale/enetc/enetc_ethtool.c | 2 +
.../net/ethernet/freescale/enetc/enetc_pf.c | 2 +
.../net/ethernet/freescale/enetc/enetc_vf.c | 2 +
drivers/net/ethernet/hisilicon/Kconfig | 5 +
drivers/net/ethernet/hisilicon/hns3/Makefile | 13 +-
.../hns3/hns3_common/hclge_comm_cmd.c | 27 +-
.../hns3/hns3_common/hclge_comm_cmd.h | 8 -
.../hns3/hns3_common/hclge_comm_rss.c | 17 +
.../hns3/hns3_common/hclge_comm_tqp_stats.c | 5 +
.../hisilicon/hns3/hns3pf/hclge_main.c | 2 +
.../hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +
.../net/ethernet/marvell/octeontx2/Kconfig | 5 +
.../ethernet/marvell/octeontx2/nic/Makefile | 14 +-
.../marvell/octeontx2/nic/otx2_common.h | 1 -
.../marvell/octeontx2/nic/otx2_dcbnl.c | 8 +-
.../marvell/octeontx2/nic/otx2_devlink.c | 2 +
.../ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +
.../ethernet/marvell/octeontx2/nic/otx2_ptp.c | 2 +-
.../ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +
drivers/net/ethernet/ti/Kconfig | 13 +
drivers/net/ethernet/ti/Makefile | 16 +-
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +
drivers/net/ethernet/ti/cpsw.c | 3 +
drivers/net/ethernet/ti/cpsw_ale.c | 20 +
drivers/net/ethernet/ti/cpsw_ethtool.c | 24 +
drivers/net/ethernet/ti/cpsw_new.c | 3 +
drivers/net/ethernet/ti/cpsw_priv.c | 36 +
drivers/net/ethernet/ti/cpsw_sl.c | 8 +
drivers/net/ethernet/ti/davinci_cpdma.c | 33 +
drivers/net/ethernet/ti/davinci_emac.c | 2 +
drivers/net/ethernet/ti/netcp_core.c | 2 +
drivers/net/ethernet/ti/netcp_ethss.c | 2 +
drivers/platform/x86/intel/int3472/Makefile | 8 +-
drivers/platform/x86/intel/int3472/common.c | 8 +
drivers/platform/x86/intel/int3472/discrete.c | 2 +
drivers/platform/x86/intel/int3472/tps68470.c | 2 +
sound/soc/codecs/Makefile | 6 +-
sound/soc/codecs/wcd-clsh-v2.c | 903 -----------------
sound/soc/codecs/wcd-clsh-v2.h | 917 +++++++++++++++++-
104 files changed, 1679 insertions(+), 1288 deletions(-)
delete mode 100644 drivers/block/rnbd/rnbd-common.c
delete mode 100644 drivers/gpu/drm/bridge/imx/imx-ldb-helper.c
rename drivers/gpu/drm/bridge/imx/{imx8qm-ldb-drv.c => imx8qm-ldb.c} (100%)
rename drivers/gpu/drm/bridge/imx/{imx8qxp-ldb-drv.c => imx8qxp-ldb.c} (100%)
rename drivers/mfd/{rsmu_core.c => rsmu-core.c} (94%)
rename drivers/mfd/{rsmu_i2c.c => rsmu-i2c.c} (100%)
rename drivers/mfd/{rsmu_spi.c => rsmu-spi.c} (100%)
delete mode 100644 sound/soc/codecs/wcd-clsh-v2.c