Google Git
Sign in
android / kernel / hikey-linaro / refs/heads/mirror-android12-5.4
commitb666a118d94213a178631db31191c565f5584a6c[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Mon Oct 20 13:55:48 2025 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Mon Oct 20 13:55:49 2025 +0000
treedbc4976c4aa37d357edbe7da2504a6118bac8742
parentcdcb3f81dc05bd42f88ca759416912fdf53b03ec [diff]
parentbdf869add804d422e8a7bc0fdc88ca2eae480482 [diff]
Merge tag 'android12-5.4.300_r00' into android12-5.4 This merges the android12-5.4.300_r00 tag into the android12-5.4 branch, catching it up with the latest LTS releases. It contains the following commits: * bdf869add804 Revert "genirq: Provide new interfaces for affinity hints" * 857f8af62d5b Revert "i40e: Use irq_update_affinity_hint()" * 225712059c04 Revert "i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path" * ed56c512a635 Merge 5.4.300 into android12-5.4-lts |\ | * 86b57fd7c54e Linux 5.4.300 | * bc1c9ce8aeff mm/hugetlb: fix folio is still mapped when deleted | * 0a3f66fa1b90 i40e: add mask to apply valid bits for itr_idx | * 185745d56ec9 i40e: fix validation of VF state in get resources | * a6ff2af78343 i40e: fix idx validation in config queues msg | * 0543d40d6513 i40e: add validation for ring_len param | * ad80e7119268 i40e: increase max descriptors for XL710 | * 61fa824e304e mm/migrate_device: don't add folio to be freed to LRU in migrate_device_finalize() | * 4bcf5f7a6845 fbcon: Fix OOB access in font allocation | * 994bdc2d23c7 fbcon: fix integer overflow in fbcon_do_set_font | * 9176e18681cb i40e: add max boundary check for VF filters | * a88c1b2746ec i40e: fix input validation logic for action_meta | * b6cb93a7ff20 i40e: fix idx validation in i40e_validate_queue_map | * 70b0c11483d3 drm/gma500: Fix null dereference in hdmi teardown | * 572c65680278 can: peak_usb: fix shift-out-of-bounds issue | * 0fa9303c4b94 can: mcba_usb: populate ndo_change_mtu() to prevent buffer overflow | * 063539db4220 can: sun4i_can: populate ndo_change_mtu() to prevent buffer overflow | * f2c247e95810 can: hi311x: populate ndo_change_mtu() to prevent buffer overflow | * 967c5ab21a4e can: rcar_can: rcar_can_resume(): fix s2ram with PSCI | * f979a5d79b2a IB/mlx5: Fix obj_type mismatch for SRQ event subscriptions | * f5fcec379ef4 usb: core: Add 0x prefix to quirks debug output | * d6d69aeada2a ALSA: usb-audio: Fix build with CONFIG_INPUT=n | * 3d8878dca773 ALSA: usb-audio: Convert comma to semicolon | * 104ad9bae11e ALSA: usb-audio: Add mixer quirk for Sony DualSense PS5 | * 731e67629b00 ALSA: usb-audio: Remove unneeded wmb() in mixer_quirks | * 7aa869f7d5ec ALSA: usb-audio: Simplify NULL comparison in mixer_quirks | * f6d990d3ed88 ALSA: usb-audio: Avoid multiple assignments in mixer_quirks | * ad4a18c5fe60 ALSA: usb-audio: Fix block comments in mixer_quirks | * 3aa9dae33a96 KVM: SVM: Sync TPR from LAPIC into VMCB::V_TPR even if AVIC is active | * 184f608a68f9 net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer | * 7a174d11d5ef net: rfkill: gpio: add DT support | * 26606c5f0be8 serial: sc16is7xx: fix bug in flow control levels init | * ea748ebb9084 USB: gadget: dummy-hcd: Fix locking bug in RT-enabled kernels | * 6070c741cc5c usb: gadget: dummy_hcd: remove usage of list iterator past the loop body | * 8a82e3a62250 ASoC: SOF: Intel: hda-stream: Fix incorrect variable used in error message | * 8b19c813c923 ASoC: wm8974: Correct PLL rate rounding | * cbeccd028c92 ASoC: wm8940: Correct typo in control name | * b0aabb6fb22c rds: ib: Increment i_fastreg_wrs before bailing out | * e7b3519f021b mmc: mvsdio: Fix dma_unmap_sg() nents value | * 2ef1649b5a16 power: supply: bq27xxx: restrict no-battery detection to bq27000 | * 49b7640e6207 power: supply: bq27xxx: fix error return in case of no bq27000 hdq battery | * a685684e934c nilfs2: fix CFI failure when accessing /sys/fs/nilfs2/features/* | * fde6e73189f4 cnic: Fix use-after-free bugs in cnic_delete_task | * 34f9bdae1548 net: liquidio: fix overflow in octeon_init_instr_queue() | * d5cda881cfd9 Revert "net/mlx5e: Update and set Xon/Xoff upon port speed set" | * 7ec092a91ff3 tcp: Clear tcp_sk(sk)->fastopen_rsk in tcp_disconnect(). | * 6b32f38d6187 i40e: remove redundant memory barrier when cleaning Tx descs | * 6b8577bfbdf1 net: natsemi: fix `rx_dropped` double accounting on `netif_rx()` failure | * cabadd7fd15f cgroup: split cgroup_destroy_wq into 3 workqueues | * 99830c9b4a39 pcmcia: omap_cf: Mark driver struct with __refdata to prevent section mismatch | * a71068677d8e wifi: mac80211: fix incorrect type for ret | * 6e0b8d96032d ALSA: firewire-motu: drop EPOLLOUT from poll return values as write is not supported | * 8e01ea186a52 mm/memory-failure: fix VM_BUG_ON_PAGE(PagePoisoned(page)) when unpoison memory | * 64faf7d6432b soc: qcom: mdt_loader: Deal with zero e_shentsize | * 289a414a4934 phy: ti-pipe3: fix device leak at unbind | * 2e257a6125c6 dmaengine: qcom: bam_dma: Fix DT error handling for num-channels/ees | * 7d4de60d6db0 dmaengine: ti: edma: Fix memory allocation size for queue_priority_map | * ed4d6126ff0d can: j1939: j1939_local_ecu_get(): undo increment when j1939_local_ecu_get() fails | * f23fe24f0663 can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when j1939_local_ecu_get() failed | * 13ab9adef3cd i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path | * 18c4c3578288 i40e: Use irq_update_affinity_hint() | * 7b2a67322aff genirq: Provide new interfaces for affinity hints | * 4dbabe8e6659 genirq: Export affinity setter for modules | * 6fe90f60d0ff genirq/affinity: Add irq_update_affinity_desc() | * 4a069b111eab igb: fix link test skipping when interface is admin down | * 8c60d12bba14 net: fec: Fix possible NPD in fec_enet_phy_reset_after_clk_enable() | * 2f28d51cf862 USB: serial: option: add Telit Cinterion LE910C4-WWX new compositions | * b896501ea175 USB: serial: option: add Telit Cinterion FN990A w/audio compositions | * 931ee3272119 tty: hvc_console: Call hvc_kick in hvc_write unconditionally | * 8016e5f11cc9 mtd: nand: raw: atmel: Respect tAR, tCLR in read setup timing | * d5c6321105a0 mtd: nand: raw: atmel: Fix comment in timings preparation | * dc1c6e60993b mtd: rawnand: stm32_fmc2: avoid overlapping mappings on ECC buffer | * b6590e470538 mm/khugepaged: fix the address passed to notifier on testing young | * 5c9f44713f2d fuse: prevent overflow in copy_file_range return value | * 8d63276628a7 fuse: check if copy_file_range() returns larger than requested size | * 18630c36fa88 mtd: rawnand: stm32_fmc2: fix ECC overwrite | * 16e518ca84df ocfs2: fix recursive semaphore deadlock in fiemap call | * c97018c874dc EDAC/altera: Delete an inappropriate dma_free_coherent() call | * 08f58d10f5ab tcp_bpf: Call sk_msg_free() when tcp_bpf_send_verdict() fails to allocate psock->cork. | * 85817febb25d NFSv4: Don't clear capabilities that won't be reset | * 83083c5fc7cf net: Fix null-ptr-deref by sock_lock_init_class_and_name() and rmmod. | * 6ddde3e46176 usb: hub: Fix flushing of delayed work used for post resume purposes * 42a4886a28db Merge android12-5.4 into android12-5.4-lts Change-Id: Ifb547f746197bc1bd922a0639c5818335b4f30a8 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: dbc4976c4aa37d357edbe7da2504a6118bac8742
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. ipc/
  12. kernel/
  13. lib/
  14. LICENSES/
  15. mm/
  16. net/
  17. samples/
  18. scripts/
  19. security/
  20. sound/
  21. tools/
  22. usr/
  23. virt/
  24. .clang-format
  25. .cocciconfig
  26. .get_maintainer.ignore
  27. .gitattributes
  28. .gitignore
  29. .mailmap
  30. build.config.aarch64
  31. build.config.allmodconfig
  32. build.config.allmodconfig.aarch64
  33. build.config.allmodconfig.arm
  34. build.config.allmodconfig.x86_64
  35. build.config.arm
  36. build.config.common
  37. build.config.db845c
  38. build.config.gki
  39. build.config.gki-debug.aarch64
  40. build.config.gki-debug.x86_64
  41. build.config.gki.aarch64
  42. build.config.gki.x86_64
  43. build.config.gki_kasan
  44. build.config.gki_kasan.aarch64
  45. build.config.gki_kasan.x86_64
  46. build.config.gki_kprobes
  47. build.config.gki_kprobes.aarch64
  48. build.config.gki_kprobes.x86_64
  49. build.config.hikey960
  50. build.config.x86_64
  51. COPYING
  52. CREDITS
  53. Kbuild
  54. Kconfig
  55. MAINTAINERS
  56. Makefile
  57. OWNERS
  58. README
  59. 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.

  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 kernel-team@android.com. 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 script/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 ...) 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 <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>
  • 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 ...) line
    • Example:
 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>

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 <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>
  • 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
    • 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 <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>

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 <joe.smith@foo.org>
  • 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)