diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/nvdimm/nd.h | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/nvdimm/nd.h')
| -rw-r--r-- | drivers/nvdimm/nd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h index 40476399d227..8024a0ef86d3 100644 --- a/drivers/nvdimm/nd.h +++ b/drivers/nvdimm/nd.h | |||
| @@ -143,6 +143,7 @@ struct nd_btt { | |||
| 143 | struct nd_namespace_common *ndns; | 143 | struct nd_namespace_common *ndns; |
| 144 | struct btt *btt; | 144 | struct btt *btt; |
| 145 | unsigned long lbasize; | 145 | unsigned long lbasize; |
| 146 | u64 size; | ||
| 146 | u8 *uuid; | 147 | u8 *uuid; |
| 147 | int id; | 148 | int id; |
| 148 | }; | 149 | }; |