Merge c2f8af10 ("mtd: rawnand: meson: fix scrambling mode value in command...

Merge c2f8af10 ("mtd: rawnand: meson: fix scrambling mode value in command macro") into android-mainline

Steps on the way to 5.10.215

Resolves merge conflicts with:

	drivers/tty/serial/max310x.c

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