diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:32:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:32:06 +0100 |
| commit | 7bddba775026d51dede9d726bd8158574c0ec5a6 (patch) | |
| tree | 6ec6b7cfd9ef9a7915bf1f4ce13cff1d3944694f /fs/ext4/Kconfig | |
| parent | Merge tag 'usb-ci-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Linux 4.10-rc7 (diff) | |
| download | linux-7bddba775026d51dede9d726bd8158574c0ec5a6.tar.xz linux-7bddba775026d51dede9d726bd8158574c0ec5a6.zip | |
Merge 4.10-rc7 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4/Kconfig')
| -rw-r--r-- | fs/ext4/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 7b90691e98c4..e38039fd96ff 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -37,7 +37,6 @@ config EXT4_FS select CRC16 select CRYPTO select CRYPTO_CRC32C - select FS_IOMAP if FS_DAX help This is the next generation of the ext3 filesystem. |