LU-9771 flr: Merge branch 'flr'

Merge remote-tracking branch 'origin/flr'.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: Idee9297fbcab2bea3bd5987c94e4b4e79c49b3b6

diff --cc lustre/include/uapi/linux/lustre/lustre_user.h
Simple merge

diff --cc lustre/llite/file.c
Simple merge

diff --cc lustre/lod/lod_object.c
Simple merge

diff --cc lustre/mdc/mdc_lib.c
Simple merge

diff --cc lustre/mdt/mdt_handler.c
Simple merge

diff --cc lustre/mdt/mdt_internal.h
Simple merge

diff --cc lustre/osc/osc_request.c
Simple merge

diff --cc lustre/tests/conf-sanity.sh
Simple merge

diff --cc lustre/tests/sanity-hsm.sh
Simple merge

diff --cc lustre/tests/sanity.sh
Simple merge

diff --cc lustre/tests/test-framework.sh
Simple merge

diff --cc lustre/utils/Makefile.am
Simple merge

diff --cc lustre/utils/lfs.c
Simple merge

diff --cc lustre/utils/liblustreapi.c
Simple merge

diff --cc lustre/utils/wiretest.c
Simple merge