diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-11 18:18:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-11 18:18:50 -0700 |
| commit | b1a62749946ee1956a480ba31e7d4929aa561d30 (patch) | |
| tree | acf6ff59b76d424a7aad9c9b5a81455e00ccc19d /fs | |
| parent | b961f8dc8976c091180839f4483d67b7c2ca2578 (diff) | |
| parent | 8449d150e66c43fd9bfd77691a56327dfdccedd7 (diff) | |
| download | linux-b1a62749946ee1956a480ba31e7d4929aa561d30.tar.gz linux-b1a62749946ee1956a480ba31e7d4929aa561d30.tar.bz2 linux-b1a62749946ee1956a480ba31e7d4929aa561d30.zip | |
Merge branch 'akpm' (patches from Andrew)
Pull updates from Andrew Morton:
"A few fixes and stragglers.
Subsystems affected by this patch series: mm/memory-failure, ocfs2,
lib/lzo, misc"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
amdgpu: a NULL ->mm does not mean a thread is a kthread
lib/lzo: fix ambiguous encoding bug in lzo-rle
ocfs2: fix build failure when TCP/IP is disabled
mm/memory-failure: send SIGBUS(BUS_MCEERR_AR) only to current thread
mm/memory-failure: prioritize prctl(PR_MCE_KILL) over vm.memory_failure_early_kill
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig index 1177c33df895..aca16624b370 100644 --- a/fs/ocfs2/Kconfig +++ b/fs/ocfs2/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config OCFS2_FS tristate "OCFS2 file system support" - depends on NET && SYSFS && CONFIGFS_FS + depends on INET && SYSFS && CONFIGFS_FS select JBD2 select CRC32 select QUOTA |