diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2018-08-22 07:04:59 +0000 |
|---|---|---|
| committer | Johannes Weiner <hannes@cmpxchg.org> | 2018-08-22 07:04:59 +0000 |
| commit | acea243f96554dade2e7830d6560f7f7961124dd (patch) | |
| tree | 1fd385a137fe0d4049cca85d65392823ed5d3a8c | |
| parent | 901a2c8dccf38d529cb8fbb950d568408cb5111f (diff) | |
linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | include/linux/fs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 3f9ff09cf931..842fde0f0981 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -164,12 +164,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, /* File is capable of returning -EAGAIN if I/O will block */ #define FMODE_NOWAIT ((__force fmode_t)0x8000000) -<<<<<<< HEAD -======= /* File represents mount that needs unmounting */ #define FMODE_NEED_UNMOUNT ((__force fmode_t)0x10000000) ->>>>>>> linux-next/akpm-base /* File does not contribute to nr_files count */ #define FMODE_NOACCOUNT ((__force fmode_t)0x20000000) |