| commit | 5b92479b88acb35fe280454cdecf55e84ad001c4 | [log] [tgz] |
|---|---|---|
| author | Michael Bestas <mkbestas@lineageos.org> | Thu Jun 08 11:39:35 2023 +0300 |
| committer | Michael Bestas <mkbestas@lineageos.org> | Thu Jun 08 11:39:35 2023 +0300 |
| tree | 88f8a1b54b7f2ff61dc6c06e9dbafbe4e938a0e1 | |
| parent | dfc478b4fe6ac51c78707cd71f6b5c9ff35450b7 [diff] | |
| parent | ceee9c69b161d06b0db0a8c6e11e43fa205deabe [diff] |
Merge tag 'LA.UM.9.14.r1-21600-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina "LA.UM.9.14.r1-21600-LAHAINA.QSSI14.0" * tag 'LA.UM.9.14.r1-21600-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4: msm: kgsl: Keep postamble packets in a privileged buffer msm: kgsl: Check user generated timestamp before queuing drawobjs msm: ipa3: add ioctl interface for dual backhaul dwc3: Add check for sg queued trbs while reclaiming soc: spcom: Addressing KASAN issue slab-out-of-bounds clk: qcom: gcc: Add support for edp ref clock for Yupik clk: qcom: gcc: Add support for EDP Ref clock Yupik msm: Add config option for Realtek R8168 driver msm: synx: Check for zero before reducing bind handles ANDROID: mm/filemap: Fix missing put_page() for speculative page fault BACKPORT: FROMGIT: cgroup: Use separate src/dst nodes when preloading css_sets for migration usb: pd: Send extcon notification as soon as APSD detection is done pci: msm: Flush workqueue and destroy it in mhi controller unregister msm: mhi_dev: Update msi_disable on fetching MSI config mdt_loader: check for overflow before allocating memory ANDROID: Re-enable fast mremap and fix UAF with SPF ANDROID: mm: fix invalid backport in speculative page fault path ANDROID: disable page table moves when speculative page faults are enabled ANDROID: mm: assert that mmap_lock is taken exclusively in vm_write_begin ANDROID: mm: remove sequence counting when mmap_lock is not exclusively owned ANDROID: mm/khugepaged: add missing vm_write_{begin|end} BACKPORT: FROMLIST: mm: implement speculative handling in filemap_fault() ANDROID: mm: prevent reads of unstable pmd during speculation ANDROID: mm: prevent speculative page fault handling for in do_swap_page() ANDROID: mm: skip pte_alloc during speculative page fault i2c-msm-geni: KASAN: use-after-free in __list_add_valid+0x2c/0xc4 Conflicts: drivers/soc/qcom/mdt_loader.c kernel/cgroup/cgroup.c mm/khugepaged.c Change-Id: I762818d33586457eebad3e0bcc28f75f3865d0b6
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.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 ...) 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 c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT: instead of UPSTREAM:.UPSTREAM:(cherry-picked from ...) 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 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 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)Copy ${this_project}/drivers/hid/hid-aksys.c into ${your_kernel_root}/drivers/hid/
Compare and merge ${this_project}/drivers/hid/hid-ids.h into ${your_kernel_root}/drivers/hid/hid-ids.h : Add the following code before the last line of this file
#define USB_VENDER_ID_QUALCOMM 0x0a12 #define USB_VENDER_ID_TEMP_HHG_AKSY 0x1234 #define USB_PRODUCT_ID_AKSYS_HHG 0x1000
Merge ${this_project}/drivers/hid/Kconfig into ${your_kernel_root}/drivers/hid/Kconfig : Add the following code before the last line of this file
config HID_AKSYS_QRD tristate "AKSys gamepad USB adapter support" depends on HID ---help--- Support for AKSys gamepad USB adapter config AKSYS_QRD_FF bool "AKSys gamepad USB adapter force feedback support" depends on HID_AKSYS_QRD select INPUT_FF_MEMLESS ---help--- Say Y here if you have a AKSys gamepad USB adapter and want to enable force feedback support for it.
Merge ${this_project}/drivers/hid/Makefile into ${your_kernel_root}/drivers/hid/Makefile : Add the following code at the end of this file
obj-$(CONFIG_HID_AKSYS_QRD) += hid-aksys.o
Modify your kernel's default build configuration file. Add the following two lines:
CONFIG_HID_AKSYS_QRD=m CONFIG_AKSYS_QRD_FF=y