Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm

2016-01-10 07:53:55 -08:00
parent e07ecd76d4 55f5560d8c
commit 8b63b6bfc1
290 changed files with 3174 additions and 1948 deletions
--- a/drivers/nvdimm/nd-core.h
+++ b/drivers/nvdimm/nd-core.h
@@ -30,6 +30,7 @@ struct nvdimm_bus {
 	struct list_head list;
 	struct device dev;
 	int id, probe_active;
+	struct list_head poison_list;
 	struct mutex reconfig_mutex;
 };