tag | d7df784e03c6bdd392ef317822de597f3cce350d | |
---|---|---|
tagger | Todd Kjos <tkjos@google.com> | Tue Jan 12 17:00:27 2021 -0800 |
object | c9251a891e2d9ae96bddf91c258b986b03fc964e |
android11-5.4 @ 5.4.86
commit | c9251a891e2d9ae96bddf91c258b986b03fc964e | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@google.com> | Wed Jan 06 14:56:45 2021 +0100 |
committer | Greg Kroah-Hartman <gregkh@google.com> | Wed Jan 06 14:57:15 2021 +0100 |
tree | 4857e2819c3b235c7f9acc0dd5fff7dfc2ad45b1 | |
parent | fdb6c3cb27dc94fc0020095faf4dc5a82770bea0 [diff] | |
parent | 158eae71734679b43e8731c48eec269746118385 [diff] |
Merge branch 'android11-5.4' into 'android11-5.4-lts' Sync up with android11-5.4 for the following commits: 158eae717346 ANDROID: ABI: update symbols of unisoc whitelist 39327dc3065b ANDROID: usb: f_accessory: Don't drop NULL reference in acc_disconnect() e0ea2cf7660d ANDROID: usb: f_accessory: Avoid bitfields for shared variables 13dd1a33bc1d ANDROID: usb: f_accessory: Cancel any pending work before teardown f0e78b659585 ANDROID: usb: f_accessory: Don't corrupt global state on double registration 7f7a5de5ec04 ANDROID: usb: f_accessory: Fix teardown ordering in acc_release() cfe67611673b ANDROID: usb: f_accessory: Add refcounting to global 'acc_dev' 62adf8c60560 ANDROID: usb: f_accessory: Wrap '_acc_dev' in get()/put() accessors 21d2a9d7c700 ANDROID: usb: f_accessory: Remove useless assignment 82262d09f1ff ANDROID: usb: f_accessory: Remove useless non-debug prints 4df304a4df0d ANDROID: usb: f_accessory: Remove stale comments a91758267286 ANDROID: USB: f_accessory: Check dev pointer before decoding ctrl request d61ede24cbb2 ANDROID: Update abi_gki_aarch64_goldfish c29fbd7cd728 UPSTREAM: driver core: Fix lockdep warning on wfs_lock f85485b30163 ANDROID: ABI: update allowed list for galaxy a9911f2a9a23 UPSTREAM: arm64: pgtable: Fix pte_accessible() Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I5eb6af3d9ed47b740851a586cd34535ab51482c8
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)