Google Git
Sign in
android / kernel / common / refs/heads/android15-6.6-lts
commit31e1e0b064701daeb6bec4df385e4ec01ca4682d[log] [tgz]
authorGreg Kroah-Hartman <[email protected]>Thu Feb 06 06:43:18 2025 +0000
committerGreg Kroah-Hartman <[email protected]>Thu Feb 06 06:43:49 2025 +0000
tree3843d883650090a1bf5d418c4ef6036005648234
parent3259186cfce28ef24bd433814d61c2fd48395395 [diff]
parentd51b7d37f14e76db7a1a13046ed87198c0407fcb [diff]
Merge 6.6.75 into android15-6.6-lts

GKI (arm64) relevant 26 out of 45 changes, affecting 35 files +527/-132
  06bfc95f817b seccomp: Stub for !CONFIG_SECCOMP [1 file, +1/-1]
  2148a41dc8ff irqchip/sunxi-nmi: Add missing SKIP_WAKE flag [1 file, +2/-1]
  52da02521ede ipv6: Fix soft lockups in fib6_select_path under high next hop churn [4 files, +297/-19]
  3bd97ebf7e4f libfs: Re-arrange locking in offset_iterate_dir() [1 file, +6/-6]
  fc90bbcc08da libfs: Define a minimum directory offset [1 file, +8/-5]
  307f68e49dda libfs: Add simple_offset_empty() [3 files, +35/-2]
  3e716f31ff8b libfs: Fix simple_offset_rename_exchange() [1 file, +19/-6]
  753828d6775e libfs: Add simple_offset_rename() API [3 files, +24/-2]
  2b6da3fa94cd shmem: Fix shmem_rename2() [1 file, +9/-0]
  a01bb1c5cac9 libfs: Return ENOSPC when the directory offset range is exhausted [1 file, +2/-2]
  6b1de53b1a0a Revert "libfs: Add simple_offset_empty()" [3 files, +2/-35]
  0f03dd06e5d1 libfs: Replace simple_offset end-of-directory detection [1 file, +21/-16]
  850e696f3627 libfs: Use d_children list to iterate simple_offset directories [1 file, +59/-25]
  a99bacb35c14 block: fix integer overflow in BLKSECDISCARD [1 file, +5/-4]
  7d6405c13b0d cachestat: fix page cache statistics permission checking [1 file, +19/-0]
  6e35f560daeb ext4: fix access to uninitialised lock in fc replay path [1 file, +2/-1]
  e0500e4373cd ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_find() [1 file, +1/-1]
  3d8f4dc8c78f Revert "usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null" [1 file, +4/-4]
  cca07b29f7af ALSA: usb-audio: Add delay quirk for USB Audio Device [1 file, +2/-0]
  80327feb234c Input: xpad - add support for Nacon Pro Compact [1 file, +1/-0]
  dc8c9c171ef3 Input: atkbd - map F23 key to support default copilot shortcut [1 file, +1/-1]
  7ea7e327a199 Input: xpad - add unofficial Xbox 360 wireless receiver clone [1 file, +1/-0]
  723aa536831c Input: xpad - add QH Electronics VID/PID [1 file, +2/-0]
  c009f1865582 Input: xpad - improve name of 8BitDo controller 2dc8:3106 [1 file, +1/-1]
  7c477b26d39e Input: xpad - add support for Nacon Evol-X Xbox One Controller [1 file, +2/-0]
  35b144b393db Input: xpad - add support for wooting two he (arm) [1 file, +1/-0]

Changes in 6.6.75
	ASoC: wm8994: Add depends on MFD core
	ASoC: samsung: Add missing selects for MFD_WM8994
	seccomp: Stub for !CONFIG_SECCOMP
	scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request
	drm/amd/display: Use HW lock mgr for PSR1
	of/unittest: Add test that of_address_to_resource() fails on non-translatable address
	irqchip/sunxi-nmi: Add missing SKIP_WAKE flag
	hwmon: (drivetemp) Set scsi command timeout to 10s
	ASoC: samsung: Add missing depends on I2C
	ata: libata-core: Set ATA_QCFLAG_RTF_FILLED in fill_result_tf()
	cpufreq: amd-pstate: add check for cpufreq_cpu_get's return value
	ipv6: Fix soft lockups in fib6_select_path under high next hop churn
	RDMA/bnxt_re: Avoid CPU lockups due fifo occupancy check loop
	gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag
	libfs: Re-arrange locking in offset_iterate_dir()
	libfs: Define a minimum directory offset
	libfs: Add simple_offset_empty()
	libfs: Fix simple_offset_rename_exchange()
	libfs: Add simple_offset_rename() API
	shmem: Fix shmem_rename2()
	libfs: Return ENOSPC when the directory offset range is exhausted
	Revert "libfs: Add simple_offset_empty()"
	libfs: Replace simple_offset end-of-directory detection
	libfs: Use d_children list to iterate simple_offset directories
	smb: client: handle lack of EA support in smb2_query_path_info()
	net: sched: fix ets qdisc OOB Indexing
	block: fix integer overflow in BLKSECDISCARD
	Revert "HID: multitouch: Add support for lenovo Y9000P Touchpad"
	cachestat: fix page cache statistics permission checking
	vfio/platform: check the bounds of read/write syscalls
	ext4: fix access to uninitialised lock in fc replay path
	ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_find()
	scsi: storvsc: Ratelimit warning logs to prevent VM denial of service
	USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb()
	Revert "usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null"
	ALSA: usb-audio: Add delay quirk for USB Audio Device
	Input: xpad - add support for Nacon Pro Compact
	Input: atkbd - map F23 key to support default copilot shortcut
	Input: xpad - add unofficial Xbox 360 wireless receiver clone
	Input: xpad - add QH Electronics VID/PID
	Input: xpad - improve name of 8BitDo controller 2dc8:3106
	Input: xpad - add support for Nacon Evol-X Xbox One Controller
	Input: xpad - add support for wooting two he (arm)
	drm/v3d: Assign job pointer to NULL before signaling the fence
	Linux 6.6.75

Change-Id: I8355ce787f82e08b1628dbd9a1f1187ea15b6dbb
Signed-off-by: Greg Kroah-Hartman <[email protected]>
tree: 3843d883650090a1bf5d418c4ef6036005648234
  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. abi.bzl
  34. BUILD.bazel
  35. build.config.aarch64
  36. build.config.allmodconfig
  37. build.config.allmodconfig.aarch64
  38. build.config.allmodconfig.arm
  39. build.config.allmodconfig.x86_64
  40. build.config.amlogic
  41. build.config.arm
  42. build.config.common
  43. build.config.constants
  44. build.config.crashdump
  45. build.config.crashdump.aarch64
  46. build.config.crashdump.x86_64
  47. build.config.db845c
  48. build.config.gki
  49. build.config.gki.aarch64
  50. build.config.gki.aarch64.fips140
  51. build.config.gki.x86_64
  52. build.config.gki_kasan
  53. build.config.gki_kasan.aarch64
  54. build.config.gki_kasan.x86_64
  55. build.config.gki_kprobes
  56. build.config.gki_kprobes.aarch64
  57. build.config.gki_kprobes.x86_64
  58. build.config.khwasan
  59. build.config.kunit.aarch64
  60. build.config.kunit.x86_64
  61. build.config.microdroid
  62. build.config.microdroid.aarch64
  63. build.config.microdroid.x86_64
  64. build.config.rockpi4
  65. build.config.x86_64
  66. COPYING
  67. CREDITS
  68. Kbuild
  69. Kconfig
  70. Kconfig.ext
  71. MAINTAINERS
  72. Makefile
  73. modules.bzl
  74. OWNERS
  75. README
  76. 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 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

  • All patches must conform to the Linux kernel coding standards and pass scripts/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

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)