From: Greg Kroah-Hartman gregkh@linuxfoundation.org
Merge 109 patches from 4.19.93 stable branch (113 total) beside 3 already merged patches: 332ed88 perf strbuf: Remove redundant va_end() in strbuf_addv() 40696eb Make filldir[64]() verify the directory entry filename is valid 0643c3d filldir[64]: remove WARN_ON_ONCE() for bad directory entries
Delay to merge commit 0af1ad3b1ce5 ("ext4: update direct I/O read lock pattern for IOCB_NOWAIT") because it conflicts with 7d434de5f404 ("Revert "ext4: Allow parallel DIO reads"").
Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 080232ef..b3b166c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 92 +SUBLEVEL = 93 EXTRAVERSION = NAME = "People's Front"