Merge android13-5.10 into android13-5.10-lts This merges the android13-5.10 branch into the -lts branch, catching it up with the latest changes in there. It contains the following commits: * 68b45855d786 Merge tag 'android13-5.10.260_r00' into android13-5.10 * 71db3cbb4112 UPSTREAM: locking/rtmutex: Skip remove_waiter() when waiter is not enqueued * 6d10b3da26d5 UPSTREAM: rtmutex: Use waiter::task instead of current in remove_waiter() * 2a1505f4186e BACKPORT: FROMGIT: dma-coherent: use KiB in DMA allocation logs * 7f11e2633e95 FROMGIT: HID: core: Fix OOB read in hid_get_report for numbered reports * 14b2b9ab7fd5 UPSTREAM: arm64: errata: Mitigate TLBI errata on Microsoft Azure Cobalt 100 CPU * 8e0ec905005c UPSTREAM: arm64: Subscribe Microsoft Azure Cobalt 100 to ARM Neoverse N2 errata * 078f96440195 UPSTREAM: arm64: errata: Mitigate TLBI errata on NVIDIA Olympus CPU * 283daadd30ef UPSTREAM: arm64: errata: Mitigate TLBI errata on various Arm CPUs * f5c5588350ca UPSTREAM: arm64: cputype: Add C1-Premium definitions * 6208ebb8855b UPSTREAM: arm64: cputype: Add C1-Ultra definitions * 7e95b2aae612 UPSTREAM: arm64: cputype: Add NVIDIA Olympus definitions * bbc27080a51d UPSTREAM: arm64: tlb: Optimize ARM64_WORKAROUND_REPEAT_TLBI * 9e169f2a9e15 UPSTREAM: arm64: tlb: Allow XZR argument to TLBI ops * e306259baa8b UPSTREAM: KVM: arm64: Remove VPIPT I-cache handling * 44314cd25420 ANDROID: Fix ABI issues related to changed hid_report_raw_event() * 31a4cca6e8e1 UPSTREAM: HID: core: Fix size_t specifier in hid_report_raw_event() * 2809dc074c7d UPSTREAM: HID: pass the buffer size to hid_report_raw_event * d1d6a995ea6c UPSTREAM: HID: core: Add printk_ratelimited variants to hid_warn() etc * 98fd5314ee9e ANDROID: dm-bow: Fix Use-After-free in dm_bow_dtr() * 94b9cd103225 UPSTREAM: Bluetooth: RFCOMM: hold listener socket in rfcomm_connect_ind() Change-Id: I528b656fef0e6995eedbab797b7e1ca3ebd3fe0b 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.
EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.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.plUPSTREAM:, 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 commit ...) line 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
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 commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT: instead of UPSTREAM:.UPSTREAM:(cherry picked from commit ...) line BACKPORT: 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 commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
[joe: 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.orgBug: tag with the Android bug (required for patches not accepted into a maintainer tree)BACKPORT: 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 bug ANDROID: 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)