diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:56:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-03-28 10:58:28 +0100 |
| commit | cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb (patch) | |
| tree | 52591d7b53600d5d39369525a356ccb81e22fcd9 /include/linux/blk_types.h | |
| parent | proc/kcore: Remove unused kclist_add_remap() (diff) | |
| parent | Linux 5.1-rc2 (diff) | |
| download | wireguard-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.tar.xz wireguard-linux-cfa637cb20e96fe8cf44b867a7d7c34649cbf8eb.zip | |
Merge tag 'v5.1-rc2' into core/urgent, to resolve a conflict
Conflicts:
include/linux/kcore.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/blk_types.h')
| -rw-r--r-- | include/linux/blk_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index d66bf5f32610..791fee35df88 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -215,6 +215,7 @@ struct bio { /* * bio flags */ +#define BIO_NO_PAGE_REF 0 /* don't put release vec pages */ #define BIO_SEG_VALID 1 /* bi_phys_segments valid */ #define BIO_CLONED 2 /* doesn't own data */ #define BIO_BOUNCED 3 /* bio is a bounce bio */ |