diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 16:01:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 16:01:36 -0700 |
| commit | 516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch) | |
| tree | ff37e84692dbef5063bbf22672eb8bfad0f25dd8 /include/linux/drbd.h | |
| parent | 6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff) | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
| download | talos-op-linux-516d5f8b04ce2bcd24f03323fc743ae25b81373d.tar.gz talos-op-linux-516d5f8b04ce2bcd24f03323fc743ae25b81373d.zip | |
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'include/linux/drbd.h')
| -rw-r--r-- | include/linux/drbd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 3dbe9bd57a09..debb70d40547 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h @@ -52,7 +52,7 @@ #endif extern const char *drbd_buildtag(void); -#define REL_VERSION "8.4.3" +#define REL_VERSION "8.4.5" #define API_VERSION 1 #define PRO_VERSION_MIN 86 #define PRO_VERSION_MAX 101 @@ -245,7 +245,7 @@ enum drbd_disk_state { D_DISKLESS, D_ATTACHING, /* In the process of reading the meta-data */ D_FAILED, /* Becomes D_DISKLESS as soon as we told it the peer */ - /* when >= D_FAILED it is legal to access mdev->bc */ + /* when >= D_FAILED it is legal to access mdev->ldev */ D_NEGOTIATING, /* Late attaching state, we need to talk to the peer */ D_INCONSISTENT, D_OUTDATED, |
