Merge branch 'android11-5.4' into android11-5.4-lts
Catch up on some non-lts changes. Commits in here include the following: * 4c8fb327 Merge tag 'android11-5.4.289_r00' into android11-5.4 * bf5b85fe ANDROID: GKI: add Trimble symbol list * 4cd26955 UPSTREAM: selinux: ignore unknown extended permissions * 1194f08d ANDROID: ABI: Update allowed list for galaxy * 2057b3f0 UPSTREAM: ALSA: usb-audio: Fix a DMA to stack memory bug * 01c19aa8 UPSTREAM: ALSA: usb-audio: Fix out of bounds reads when finding clock sources * 5d0f7249 UPSTREAM: ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy and Mbox devices * d24bf3c2 Revert "UPSTREAM: unicode: Don't special case ignorable code points" * dd94f8e4 Reapply "UPSTREAM: unicode: Don't special case ignorable code points" Change-Id: Ia1eb9089f9edaba3442440fe44f974cc8955ca70 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please register or sign in to comment