Google Git
Sign in
android / kernel / common / 9b28b48fb343d8098f9f2ee84c8eeefc9e03cbcb
commit9b28b48fb343d8098f9f2ee84c8eeefc9e03cbcb[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Wed Dec 29 14:17:18 2021 +0100
committerGreg Kroah-Hartman <gregkh@google.com>Wed Dec 29 14:17:18 2021 +0100
treea5259af0c661fafb4d5234920fe9281304026043
parentba13eb1927e10f9ce94bc57d5c0487c0eedb40c1 [diff]
parenteb967e323f7fb073c51401070f7d2cb381a003f7 [diff]
Merge 5.10.89 into android12-5.10-lts

Changes in 5.10.89
	arm64: vdso32: drop -no-integrated-as flag
	arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd
	net: usb: lan78xx: add Allied Telesis AT29M2-AF
	ext4: prevent partial update of the extent blocks
	ext4: check for out-of-order index extents in ext4_valid_extent_entries()
	ext4: check for inconsistent extents between index and leaf block
	HID: holtek: fix mouse probing
	HID: potential dereference of null pointer
	arm64: dts: allwinner: orangepi-zero-plus: fix PHY mode
	spi: change clk_disable_unprepare to clk_unprepare
	ASoC: meson: aiu: fifo: Add missing dma_coerce_mask_and_coherent()
	IB/qib: Fix memory leak in qib_user_sdma_queue_pkts()
	RDMA/hns: Replace kfree() with kvfree()
	netfilter: fix regression in looped (broad|multi)cast's MAC handling
	ARM: dts: imx6qdl-wandboard: Fix Ethernet support
	net: marvell: prestera: fix incorrect return of port_find
	qlcnic: potential dereference null pointer of rx_queue->page_ring
	net: accept UFOv6 packages in virtio_net_hdr_to_skb
	net: skip virtio_net_hdr_set_proto if protocol already set
	igb: fix deadlock caused by taking RTNL in RPM resume path
	ipmi: Fix UAF when uninstall ipmi_si and ipmi_msghandler module
	bonding: fix ad_actor_system option setting to default
	fjes: Check for error irq
	drivers: net: smc911x: Check for error irq
	net: ks8851: Check for error irq
	sfc: Check null pointer of rx_queue->page_ring
	sfc: falcon: Check null pointer of rx_queue->page_ring
	Input: elantech - fix stack out of bound access in elantech_change_report_id()
	pinctrl: bcm2835: Change init order for gpio hogs
	hwmon: (lm90) Fix usage of CONFIG2 register in detect function
	hwmon: (lm90) Add basic support for TI TMP461
	hwmon: (lm90) Introduce flag indicating extended temperature support
	hwmon: (lm90) Drop critical attribute support for MAX6654
	ALSA: jack: Check the return value of kstrdup()
	ALSA: drivers: opl3: Fix incorrect use of vp->state
	ALSA: hda/realtek: Amp init fixup for HP ZBook 15 G6
	ALSA: hda/realtek: Add new alc285-hp-amp-init model
	ALSA: hda/realtek: Fix quirk for Clevo NJ51CU
	ASoC: meson: aiu: Move AIU_I2S_MISC hold setting to aiu-fifo-i2s
	Input: atmel_mxt_ts - fix double free in mxt_read_info_block
	ipmi: bail out if init_srcu_struct fails
	ipmi: ssif: initialize ssif_info->client early
	ipmi: fix initialization when workqueue allocation fails
	parisc: Correct completer in lws start
	parisc: Fix mask used to select futex spinlock
	tee: handle lookup of shm with reference count 0
	x86/pkey: Fix undefined behaviour with PKRU_WD_BIT
	platform/x86: intel_pmc_core: fix memleak on registration failure
	KVM: VMX: Wake vCPU when delivering posted IRQ even if vCPU == this vCPU
	pinctrl: stm32: consider the GPIO offset to expose all the GPIO lines
	gpio: dln2: Fix interrupts when replugging the device
	mmc: sdhci-tegra: Fix switch to HS400ES mode
	mmc: meson-mx-sdhc: Set MANUAL_STOP for multi-block SDIO commands
	mmc: core: Disable card detect during shutdown
	mmc: mmci: stm32: clear DLYB_CR after sending tuning command
	ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling
	mac80211: fix locking in ieee80211_start_ap error path
	mm/hwpoison: clear MF_COUNT_INCREASED before retrying get_any_page()
	tee: optee: Fix incorrect page free bug
	f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr()
	ceph: fix up non-directory creation in SGID directories
	usb: gadget: u_ether: fix race in setting MAC address in setup phase
	KVM: VMX: Fix stale docs for kvm-intel.emulate_invalid_guest_state
	mm: mempolicy: fix THP allocations escaping mempolicy restrictions
	Input: elants_i2c - do not check Remark ID on eKTH3900/eKTH5312
	Input: goodix - add id->model mapping for the "9111" model
	ASoC: tas2770: Fix setting of high sample rates
	ASoC: rt5682: fix the wrong jack type detected
	pinctrl: mediatek: fix global-out-of-bounds issue
	hwmom: (lm90) Fix citical alarm status for MAX6680/MAX6681
	hwmon: (lm90) Do not report 'busy' status bit as alarm
	ax25: NPD bug when detaching AX25 device
	hamradio: defer ax25 kfree after unregister_netdev
	hamradio: improve the incomplete fix to avoid NPD
	phonet/pep: refuse to enable an unbound pipe
	Linux 5.10.89

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia55f14e15b207944d78ec600ad4c4c7a79760e56
tree: a5259af0c661fafb4d5234920fe9281304026043
  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.amlogic
  36. build.config.arm
  37. build.config.common
  38. build.config.db845c
  39. build.config.gki
  40. build.config.gki-debug.aarch64
  41. build.config.gki-debug.x86_64
  42. build.config.gki.aarch64
  43. build.config.gki.aarch64.fips140
  44. build.config.gki.aarch64.fips140_eval_testing
  45. build.config.gki.x86_64
  46. build.config.gki_kasan
  47. build.config.gki_kasan.aarch64
  48. build.config.gki_kasan.x86_64
  49. build.config.gki_kprobes
  50. build.config.gki_kprobes.aarch64
  51. build.config.gki_kprobes.x86_64
  52. build.config.hikey960
  53. build.config.khwasan
  54. build.config.rockchip
  55. build.config.x86_64
  56. COPYING
  57. CREDITS
  58. Kbuild
  59. Kconfig
  60. MAINTAINERS
  61. Makefile
  62. OWNERS
  63. README
  64. 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 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 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 <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>
  • 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 <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>

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