Merge remote-tracking branch 'driver-core/driver-core-next'

diff --cc arch/arm64/kernel/debug-monitors.c
Simple merge

diff --cc drivers/acpi/internal.h
Simple merge

diff --cc drivers/base/dma-contiguous.c
Simple merge

diff --cc drivers/base/regmap/internal.h
Simple merge

diff --cc drivers/bluetooth/hci_qca.c
Simple merge

diff --cc drivers/iommu/amd_iommu_init.c
Simple merge

diff --cc drivers/iommu/amd_iommu_types.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/core.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc include/linux/edac.h
index b3d87e5822f8aaba74dfe54a0730dffac499d990,7c6b7ba55589439ed09b1a6bde868bc1b82fa3f2..4fe67b853de042d3fcc45910ab929fb320aab33f
--- 1/include/linux/edac.h
--- 2/include/linux/edac.h
+++ b/include/linux/edac.h
@@@ -769,10 -769,12 +769,10 @@@ struct mem_ctl_info 
        /* the internal state of this controller instance */
        int op_state;
  
 -#ifdef CONFIG_EDAC_DEBUG
        struct dentry *debugfs;
        u8 fake_inject_layer[EDAC_MAX_LAYERS];
-       u32 fake_inject_ue;
+       bool fake_inject_ue;
        u16 fake_inject_count;
 -#endif
  };
  
  /*

diff --cc kernel/futex.c
Simple merge