A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-06 20:03:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge android11-5.4 into android11-5.4-lts

Browse source 
This merges the android11-5.4 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* c92395c2d6 Merge tag 'android11-5.4.299_r00' into android11-5.4
* 189b48ebd1 UPSTREAM: vsock: Do not allow binding to VMADDR_PORT_ANY
* dd8b17eff1 UPSTREAM: perf/core: Fix potential NULL deref
* b7a9bb0844 UPSTREAM: net/packet: fix a race in packet_set_ring() and packet_notifier()

Change-Id: Id8c9b7715209878587f42a98706c8cad2ce125a0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2025-09-25 13:16:09 +00:00
commit 5732d37176
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/events/core.c
View file

@ -12129,7 +12129,8 @@ static int inherit_group(struct perf_event *parent_event,
!perf_get_aux_event(child_ctr, leader))
return -EINVAL;
}
leader->group_generation = parent_event->group_generation;
if (leader)
leader->group_generation = parent_event->group_generation;
return 0;
}