Google Git
Sign in
android / kernel / common / 992f4a2013376757905477255ff001e4d9b49ff0
commit992f4a2013376757905477255ff001e4d9b49ff0[log] [tgz]
authorGreg Kroah-Hartman <[email protected]>Thu May 23 16:54:15 2024 +0000
committerGreg Kroah-Hartman <[email protected]>Wed Jun 19 06:26:38 2024 +0000
tree1575244b8b783ead3b101fd977cc70f3609838bf
parentaf0a15ff8487df22ff5c3ec0809a53b6cd744a54 [diff]
parentf2295faba5e8249ae4082791bfc1664c88fff83a [diff]
Merge 6.1.88 into android14-6.1-lts

Changes in 6.1.88
	drm/vmwgfx: Enable DMA mappings with SEV
	drm/amdgpu: fix incorrect active rb bitmap for gfx11
	drm/amdgpu: fix incorrect number of active RBs for gfx11
	drm/amd/display: Do not recursively call manual trigger programming
	io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
	SUNRPC: Fix rpcgss_context trace event acceptor field
	selftests/ftrace: Limit length in subsystem-enable tests
	random: handle creditable entropy from atomic process context
	net: usb: ax88179_178a: avoid writing the mac address before first reading
	drm/i915/vma: Fix UAF on destroy against retire race
	x86/efi: Drop EFI stub .bss from .data section
	x86/efi: Disregard setup header of loaded image
	x86/efistub: Reinstate soft limit for initrd loading
	x86/efi: Drop alignment flags from PE section headers
	x86/boot: Remove the 'bugger off' message
	x86/boot: Omit compression buffer from PE/COFF image memory footprint
	x86/boot: Drop redundant code setting the root device
	x86/boot: Drop references to startup_64
	x86/boot: Grab kernel_info offset from zoffset header directly
	x86/boot: Set EFI handover offset directly in header asm
	x86/boot: Define setup size in linker script
	x86/boot: Derive file size from _edata symbol
	x86/boot: Construct PE/COFF .text section from assembler
	x86/boot: Drop PE/COFF .reloc section
	x86/boot: Split off PE/COFF .data section
	x86/boot: Increase section and file alignment to 4k/512
	x86/efistub: Use 1:1 file:memory mapping for PE/COFF .compat section
	x86/mm: Remove P*D_PAGE_MASK and P*D_PAGE_SIZE macros
	x86/head/64: Add missing __head annotation to startup_64_load_idt()
	x86/head/64: Move the __head definition to <asm/init.h>
	x86/sme: Move early SME kernel encryption handling into .head.text
	x86/sev: Move early startup code into .head.text section
	x86/efistub: Remap kernel text read-only before dropping NX attribute
	netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
	netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
	netfilter: br_netfilter: skip conntrack input hook for promisc packets
	netfilter: nft_set_pipapo: do not free live element
	netfilter: flowtable: validate pppoe header
	netfilter: flowtable: incorrect pppoe tuple
	af_unix: Call manage_oob() for every skb in unix_stream_read_generic().
	af_unix: Don't peek OOB data without MSG_OOB.
	net/mlx5: Lag, restore buckets number to default after hash LAG deactivation
	net/mlx5e: Prevent deadlock while disabling aRFS
	ice: tc: allow zero flags in parsing tc flower
	tun: limit printing rate when illegal packet received by tun dev
	net: dsa: mt7530: fix mirroring frames received on local port
	net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
	RDMA/rxe: Fix the problem "mutex_destroy missing"
	RDMA/cm: Print the old state when cm_destroy_id gets timeout
	RDMA/mlx5: Fix port number for counter query in multi-port configuration
	s390/qdio: handle deferred cc1
	s390/cio: fix race condition during online processing
	drm: nv04: Fix out of bounds access
	drm/panel: visionox-rm69299: don't unregister DSI device
	ARM: omap2: n8x0: stop instantiating codec platform data
	PCI: Avoid FLR for SolidRun SNET DPU rev 1
	HID: kye: Sort kye devices
	usb: pci-quirks: Reduce the length of a spinlock section in usb_amd_find_chipset_info()
	PCI: Delay after FLR of Solidigm P44 Pro NVMe
	x86/quirks: Include linux/pnp.h for arch_pnpbios_disabled()
	thunderbolt: Log function name of the called quirk
	thunderbolt: Add debug log for link controller power quirk
	PCI: Execute quirk_enable_clear_retrain_link() earlier
	PCI: switchtec: Use normal comment style
	PCI: switchtec: Add support for PCIe Gen5 devices
	ALSA: scarlett2: Move USB IDs out from device_info struct
	ALSA: scarlett2: Add support for Clarett 8Pre USB
	ASoC: ti: Convert Pandora ASoC to GPIO descriptors
	ALSA: scarlett2: Default mixer driver to enabled
	ALSA: scarlett2: Add correct product series name to messages
	ALSA: scarlett2: Add Focusrite Clarett+ 2Pre and 4Pre support
	ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support
	PCI/DPC: Use FIELD_GET()
	PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
	ALSA: scarlett2: Rename scarlett_gen2 to scarlett2
	drm: panel-orientation-quirks: Add quirk for Lenovo Legion Go
	usb: xhci: Add timeout argument in address_device USB HCD callback
	usb: new quirk to reduce the SET_ADDRESS request timeout
	clk: Remove prepare_lock hold assertion in __clk_release()
	clk: Print an info line before disabling unused clocks
	clk: Initialize struct clk_core kref earlier
	clk: Get runtime PM before walking tree during disable_unused
	clk: remove unnecessary (void*) conversions
	clk: Show active consumers of clocks in debugfs
	clk: Get runtime PM before walking tree for clk_summary
	clk: mediatek: mt8192: Correctly unregister and free clocks on failure
	clk: mediatek: mt8192: Propagate struct device for gate clocks
	clk: mediatek: clk-gate: Propagate struct device with mtk_clk_register_gates()
	clk: mediatek: clk-mtk: Propagate struct device for composites
	clk: mediatek: clk-mux: Propagate struct device for mtk-mux
	clk: mediatek: clk-mtk: Extend mtk_clk_simple_probe()
	clk: mediatek: Do a runtime PM get on controllers during probe
	x86/bugs: Fix BHI retpoline check
	x86/cpufeatures: Fix dependencies for GFNI, VAES, and VPCLMULQDQ
	ALSA: hda/realtek - Enable audio jacks of Haier Boyue G42 with ALC269VC
	binder: check offset alignment in binder_get_object()
	thunderbolt: Avoid notify PM core about runtime PM resume
	thunderbolt: Fix wake configurations after device unplug
	comedi: vmk80xx: fix incomplete endpoint checking
	serial: mxs-auart: add spinlock around changing cts state
	serial/pmac_zilog: Remove flawed mitigation for rx irq flood
	serial: stm32: Return IRQ_NONE in the ISR if no handling happend
	serial: stm32: Reset .throttled state in .startup()
	USB: serial: option: add Fibocom FM135-GL variants
	USB: serial: option: add support for Fibocom FM650/FG650
	USB: serial: option: add Lonsung U8300/U9300 product
	USB: serial: option: support Quectel EM060K sub-models
	USB: serial: option: add Rolling RW101-GL and RW135-GL support
	USB: serial: option: add Telit FN920C04 rmnet compositions
	Revert "usb: cdc-wdm: close race between read and workqueue"
	usb: dwc2: host: Fix dereference issue in DDMA completion flow.
	usb: Disable USB3 LPM at shutdown
	usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
	mei: me: disable RPL-S on SPS and IGN firmwares
	speakup: Avoid crash on very long word
	fs: sysfs: Fix reference leak in sysfs_break_active_protection()
	KVM: x86: Snapshot if a vCPU's vendor model is AMD vs. Intel compatible
	KVM: x86/pmu: Disable support for adaptive PEBS
	KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms
	arm64: hibernate: Fix level3 translation fault in swsusp_save()
	init/main.c: Fix potential static_command_line memory overflow
	mm/memory-failure: fix deadlock when hugetlb_optimize_vmemmap is enabled
	drm/amdgpu: validate the parameters of bo mapping operations more clearly
	drm/vmwgfx: Sort primary plane formats by order of preference
	drm/vmwgfx: Fix crtc's atomic check conditional
	nouveau: fix instmem race condition around ptr stores
	bootconfig: use memblock_free_late to free xbc memory to buddy
	nilfs2: fix OOB in nilfs_set_de_type
	net: dsa: mt7530: set all CPU ports in MT7531_CPU_PMAP
	net: dsa: introduce preferred_default_local_cpu_port and use on MT7530
	net: dsa: mt7530: fix improper frames on all 25MHz and 40MHz XTAL MT7530
	net: dsa: mt7530: fix enabling EEE on MT7531 switch on all boards
	ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
	ksmbd: validate request buffer size in smb2_allocate_rsp_buf()
	ksmbd: clear RENAME_NOREPLACE before calling vfs_rename
	ksmbd: common: use struct_group_attr instead of struct_group for network_open_info
	PCI/ASPM: Fix deadlock when enabling ASPM
	Linux 6.1.88

Change-Id: If2755c815fcd2d20cb858a547d2698b8dffe9016
Signed-off-by: Greg Kroah-Hartman <[email protected]>
tree: 1575244b8b783ead3b101fd977cc70f3609838bf
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. io_uring/
  12. ipc/
  13. kernel/
  14. lib/
  15. LICENSES/
  16. mm/
  17. net/
  18. rust/
  19. samples/
  20. scripts/
  21. security/
  22. sound/
  23. tools/
  24. usr/
  25. virt/
  26. .clang-format
  27. .cocciconfig
  28. .get_maintainer.ignore
  29. .gitattributes
  30. .gitignore
  31. .mailmap
  32. .rustfmt.toml
  33. BUILD.bazel
  34. build.config.aarch64
  35. build.config.allmodconfig
  36. build.config.allmodconfig.aarch64
  37. build.config.allmodconfig.arm
  38. build.config.allmodconfig.x86_64
  39. build.config.amlogic
  40. build.config.arm
  41. build.config.common
  42. build.config.constants
  43. build.config.crashdump
  44. build.config.crashdump.aarch64
  45. build.config.crashdump.x86_64
  46. build.config.db845c
  47. build.config.gki
  48. build.config.gki-debug.aarch64
  49. build.config.gki-debug.x86_64
  50. build.config.gki.aarch64
  51. build.config.gki.aarch64.fips140
  52. build.config.gki.riscv64
  53. build.config.gki.x86_64
  54. build.config.gki_kasan
  55. build.config.gki_kasan.aarch64
  56. build.config.gki_kasan.x86_64
  57. build.config.gki_kprobes
  58. build.config.gki_kprobes.aarch64
  59. build.config.gki_kprobes.x86_64
  60. build.config.khwasan
  61. build.config.microdroid
  62. build.config.microdroid.aarch64
  63. build.config.microdroid.x86_64
  64. build.config.riscv64
  65. build.config.rockchip
  66. build.config.rockpi4
  67. build.config.x86_64
  68. COPYING
  69. CREDITS
  70. Kbuild
  71. Kconfig
  72. Kconfig.ext
  73. MAINTAINERS
  74. Makefile
  75. modules.bzl
  76. OWNERS
  77. README
  78. README.md
README.md

How do I submit patches to Android Common Kernels

  1. 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.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of 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.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.

  2. 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 [email protected]. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry picked from commit ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <[email protected]>
  • 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 <[email protected]>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <[email protected]>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry picked from commit ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <[email protected]>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <[email protected]>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <[email protected]>
  • 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 <[email protected]>

        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 <[email protected]>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • add a Bug: tag with the Android bug (required for patches not accepted into a maintainer tree)
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <[email protected]>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/[email protected]/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <[email protected]>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        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 <[email protected]>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)