Merge 7bb9fa6f ("util_macros.h: fix/rework find_closest() macros") into android13-5.15-lts

Steps on the way to 5.15.173

Resolves merge conflicts in:
	fs/notify/fsnotify.c

Change-Id: If920197a24e3111969653364692b237d4a3cda23
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>