Merge remote-tracking branch 'driver-core/driver-core-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:36:09 +0000 (14:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:36:09 +0000 (14:36 +1100)
14 files changed:
1  2 
arch/arm64/kernel/debug-monitors.c
drivers/acpi/internal.h
drivers/base/dma-contiguous.c
drivers/base/regmap/internal.h
drivers/bluetooth/hci_qca.c
drivers/iommu/amd_iommu_init.c
drivers/iommu/amd_iommu_types.h
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
drivers/net/wireless/ath/ath10k/core.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/iwlwifi/mvm/mvm.h
include/linux/edac.h
kernel/futex.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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