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

Browse source

Sync up with android11-5.4 for the following commits:

904fb159c9 UPSTREAM: futex: Handle faults correctly for PI futexes
dddad86240 UPSTREAM: futex: Simplify fixup_pi_state_owner()
d245cfa173 UPSTREAM: futex: Use pi_state_update_owner() in put_pi_state()
cfe591bb90 UPSTREAM: rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
a60fba3000 UPSTREAM: futex: Provide and use pi_state_update_owner()
97500641e2 UPSTREAM: futex: Replace pointless printk in fixup_owner()
3a0f91fd81 UPSTREAM: futex: Ensure the correct return value from futex_lock_pi()
19193ef53a UPSTREAM: Revert "mm/slub: fix a memory leak in sysfs_slab_add()"
364ec3d27d UPSTREAM: futex: Don't enable IRQs unconditionally in put_pi_state()
6f8f2dc71c UPSTREAM: futex: Handle transient "ownerless" rtmutex state correctly
4fe499637b UPSTREAM: futex: Fix incorrect should_fail_futex() handling

Note, these commits were already in an LTS release (5.4.94), but the
back-merge here ensures that all went cleanly.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
Change-Id: Ic60694ecb4b61a5dc24ed589cab5d95c93950f44

...

This commit is contained in:

Greg Kroah-Hartman 2021-02-02 13:13:21 +01:00

parent c92968dd1d 904fb159c9

commit 0d298fef29

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available