Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9395ee5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4 into branch 'android11-5.4-lts'



Catch up with some commits applied to the android11-5.4 branch that adds
new symbols to ensure that the ABI remains stable with LTS merges.

This merge contains the following commits:

*   0eff7392 Merge "Merge tag 'android11-5.4.249_r00' into android11-5.4" into android11-5.4
|\
| * ef9d9e2c Merge tag 'android11-5.4.249_r00' into android11-5.4
* | 6e8aefd6 ANDROID: ABI: Update allowed list for QCOM
|/
* 12d0946b UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
* 58dbbc7e UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
* 717aa7d6 UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()

Change-Id: Iacf8e5fd79bbf52df898bded669dc8e3fb58c233
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents bf04ac50 0eff7392
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment