Merge android12-5.4 into android12-5.4-lts
This merges the android12-5.4 branch into the -lts branch, catching it up with the latest changes in there. It contains the following commits: * 93747a56 Merge tag 'android12-5.4.296_r00' into android12-5.4 * b08ab104 UPSTREAM: perf/core: Fix potential NULL deref * e1cd004a UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier() * e525f205 BACKPORT: FROMGIT: f2fs: add sysfs entry for effective lookup mode * affaaa68 BACKPORT: FROMGIT: f2fs: add lookup_mode mount option * f321835a ANDROID: 16K: Allocate pad vma on the stack * 4231bdc0 ANDROID: 16K: Don't copy data vma for maps/smaps output * d063d9fb UPSTREAM: net/sched: Always pass notifications when child class becomes empty * b7cfd86c ANDROID: bpf: do not fail to load if log is full Change-Id: I9e6034bab512f959265c51ead66bf70f136cfbf2 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading