Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Four patches.
Subsystems affected by this patch series: mm/swap, kconfig, ocfs2, and
selftests"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
selftests: vm: fix clang build error multiple output files
ocfs2: fix crash when initialize filecheck kobj fails
configs/debug: restore DEBUG_INFO=y for overriding
mm: swap: get rid of livelock in swapin readahead
+15
-16
+11
-11
fs/ocfs2/super.c
+11
-11
fs/ocfs2/super.c
···
1105
1105
goto read_super_error;
1106
1106
}
1107
1107
1108
-
root = d_make_root(inode);
1109
-
if (!root) {
1110
-
status = -ENOMEM;
1111
-
mlog_errno(status);
1112
-
goto read_super_error;
1113
-
}
1114
-
1115
-
sb->s_root = root;
1116
-
1117
-
ocfs2_complete_mount_recovery(osb);
1118
-
1119
1108
osb->osb_dev_kset = kset_create_and_add(sb->s_id, NULL,
1120
1109
&ocfs2_kset->kobj);
1121
1110
if (!osb->osb_dev_kset) {
···
1121
1132
"/sys/fs/ocfs2/%s/filecheck.\n", sb->s_id);
1122
1133
goto read_super_error;
1123
1134
}
1135
+
1136
+
root = d_make_root(inode);
1137
+
if (!root) {
1138
+
status = -ENOMEM;
1139
+
mlog_errno(status);
1140
+
goto read_super_error;
1141
+
}
1142
+
1143
+
sb->s_root = root;
1144
+
1145
+
ocfs2_complete_mount_recovery(osb);
1124
1146
1125
1147
if (ocfs2_mount_local(osb))
1126
1148
snprintf(nodestr, sizeof(nodestr), "local");
+1
kernel/configs/debug.config
+1
kernel/configs/debug.config
+1
-1
mm/swap_state.c
+1
-1
mm/swap_state.c
+2
-4
tools/testing/selftests/vm/Makefile
+2
-4
tools/testing/selftests/vm/Makefile
···
1
1
# SPDX-License-Identifier: GPL-2.0
2
2
# Makefile for vm selftests
3
3
4
+
LOCAL_HDRS += $(selfdir)/vm/local_config.h $(top_srcdir)/mm/gup_test.h
5
+
4
6
include local_config.mk
5
7
6
8
uname_M := $(shell uname -m 2>/dev/null || echo not)
···
141
139
endif
142
140
143
141
$(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap
144
-
145
-
$(OUTPUT)/gup_test: ../../../../mm/gup_test.h
146
-
147
-
$(OUTPUT)/hmm-tests: local_config.h
148
142
149
143
# HMM_EXTRA_LIBS may get set in local_config.mk, or it may be left empty.
150
144
$(OUTPUT)/hmm-tests: LDLIBS += $(HMM_EXTRA_LIBS)