tag | 94a957cd4d4c10cb8e8bcf3200f7ae0e097fc987 | |
---|---|---|
tagger | Todd Kjos <tkjos@google.com> | Fri Aug 25 23:54:11 2023 +0000 |
object | aa527280eff4fa9e946395de22f1c033aa7ac84e |
commit | aa527280eff4fa9e946395de22f1c033aa7ac84e | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@google.com> | Thu Aug 24 17:33:56 2023 +0000 |
committer | Greg Kroah-Hartman <gregkh@google.com> | Thu Aug 24 17:34:15 2023 +0000 |
tree | a8648270c49e1c3acfd14cdbc2154f77534ab908 | |
parent | 38b412a16cdf329d4c06ef6a0bb136e70d6f850c [diff] | |
parent | d57e792d0bd90ffe14380ee16bb98914e3d1f15c [diff] |
Merge android11-5.4 branch into android11-5.4-lts branch Sync up with the android11-5.4 branch to take some additional changes and some new abi symbols to properly track here. This includes the following changes: * d57e792d0bd9 UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer * 118240f14b95 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb * 28e9ee34f71a ANDROID: ABI: Update allowed list for QCOM * d62f1fc1623e UPSTREAM: net: tap_open(): set sk_uid from current_fsuid() * 657abd3d2bdb UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid() * 212a7aaded26 UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free * ac9e6cd12622 UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free * e4b912f61226 UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free * f38754f73364 UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free * 07452ef620d9 UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*() Change-Id: I9b1b3fe0b2240fb3ec51abbf9df079c2da935503 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.
LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.
script/checkpatch.pl
UPSTREAM:
, BACKPORT:
, FROMGIT:
, FROMLIST:
, or ANDROID:
.Change-Id:
tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug:
tag.Signed-off-by:
tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:
, BACKPORT:
UPSTREAM:
.(cherry-picked from ...)
lineimportant patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
UPSTREAM: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry-picked from ...)
lineBACKPORT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [ Resolved minor conflict in drivers/foo/bar.c ] Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:
, FROMLIST:
,FROMGIT:
(cherry picked from commit <sha1> <repo> <branch>)
. This must be a stable maintainer branch (not rebased, so don't use linux-next
for example).BACKPORT: FROMGIT:
important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
FROMGIT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch) Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMLIST:
Link:
tag with a link to the submittal on lore.kernel.orgBACKPORT: FROMLIST:
FROMLIST: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/ Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
ANDROID:
Fixes:
tag that cites the patch with the bugANDROID: fix android-specific bug in foobar.c This is the detailed description of the important fix Fixes: 1234abcd2468 ("foobar: add cool feature") Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
Bug:
tag with the Android bug (required for android-specific features)