merge namei.h conflicts
authorErez Zadok <ezk@cs.sunysb.edu>
Tue, 10 May 2022 18:31:35 +0000 (14:31 -0400)
committerErez Zadok <ezk@cs.sunysb.edu>
Tue, 10 May 2022 18:31:35 +0000 (14:31 -0400)
commita71e7972f7d175cdbdd1ddc84f1910b5ed18b950
tree39d191c6a11af001a1b48b2b56417f0986c2881a
parentc64f6955738b12979d887101b72f67198a5687c9
parent545728d9e08593767dd55192b0324dd4f9b71151
merge namei.h conflicts
MAINTAINERS
fs/Kconfig
fs/Makefile
fs/read_write.c
include/linux/namei.h
include/uapi/linux/magic.h