diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
| commit | db5bc601e46abbb8fc4c17a6bc848c560e80fe57 (patch) | |
| tree | b1eb723eb8acd5261336cef1b968311e6332a7b6 /include/target/iscsi/iscsi_target_core.h | |
| parent | d98f3af5986fae62bacbe7e83026660d61621a3a (diff) | |
| parent | 21b5f5d91a589931a22009d918fd319f481e8eee (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
fs/f2fs/super.c
Pick changes from LTS commit 76517ed2a7fe
("f2fs: sanity check checkpoint segno and blkoff"),
over changes from AOSP commit 0f127e451bc7
("FROMLIST: f2fs: sanity check checkpoint segno and blkoff")
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'include/target/iscsi/iscsi_target_core.h')
| -rw-r--r-- | include/target/iscsi/iscsi_target_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h index e0efe3fcf739..fdda45f26f75 100644 --- a/include/target/iscsi/iscsi_target_core.h +++ b/include/target/iscsi/iscsi_target_core.h @@ -562,6 +562,7 @@ struct iscsi_conn { #define LOGIN_FLAGS_READ_ACTIVE 1 #define LOGIN_FLAGS_CLOSED 2 #define LOGIN_FLAGS_READY 4 +#define LOGIN_FLAGS_INITIAL_PDU 8 unsigned long login_flags; struct delayed_work login_work; struct delayed_work login_cleanup_work; |