Google Git
Sign in
android / kernel / common / 221975092ae52427a365d67a8d0f3e963c05d447
commit221975092ae52427a365d67a8d0f3e963c05d447[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Wed Oct 20 11:53:41 2021 +0200
committerGreg Kroah-Hartman <gregkh@google.com>Wed Oct 20 11:53:41 2021 +0200
tree00416f863a1a898b0fbe4ca4931b214e9fb66bc0
parenta336e746e30eba1b500b78bd4ee0df0d6cb7ac0e [diff]
parent3a9842b42e421f6496a78a42a123639cf6d7ed31 [diff]
Merge 5.10.75 into android12-5.10-lts

Changes in 5.10.75
	ALSA: usb-audio: Add quirk for VF0770
	ALSA: pcm: Workaround for a wrong offset in SYNC_PTR compat ioctl
	ALSA: seq: Fix a potential UAF by wrong private_free call order
	ALSA: hda/realtek: Enable 4-speaker output for Dell Precision 5560 laptop
	ALSA: hda - Enable headphone mic on Dell Latitude laptops with ALC3254
	ALSA: hda/realtek: Complete partial device name to avoid ambiguity
	ALSA: hda/realtek: Add quirk for Clevo X170KM-G
	ALSA: hda/realtek - ALC236 headset MIC recording issue
	ALSA: hda/realtek: Add quirk for TongFang PHxTxX1
	ALSA: hda/realtek: Fix for quirk to enable speaker output on the Lenovo 13s Gen2
	ALSA: hda/realtek: Fix the mic type detection issue for ASUS G551JW
	nds32/ftrace: Fix Error: invalid operands (*UND* and *UND* sections) for `^'
	s390: fix strrchr() implementation
	clk: socfpga: agilex: fix duplicate s2f_user0_clk
	csky: don't let sigreturn play with priveleged bits of status register
	csky: Fixup regs.sr broken in ptrace
	arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE
	drm/msm: Avoid potential overflow in timeout_to_jiffies()
	btrfs: unlock newly allocated extent buffer after error
	btrfs: deal with errors when replaying dir entry during log replay
	btrfs: deal with errors when adding inode reference during log replay
	btrfs: check for error when looking up inode during dir entry replay
	btrfs: update refs for any root except tree log roots
	btrfs: fix abort logic in btrfs_replace_file_extents
	x86/resctrl: Free the ctrlval arrays when domain_setup_mon_state() fails
	mei: me: add Ice Lake-N device id.
	USB: xhci: dbc: fix tty registration race
	xhci: guard accesses to ep_state in xhci_endpoint_reset()
	xhci: Fix command ring pointer corruption while aborting a command
	xhci: Enable trust tx length quirk for Fresco FL11 USB controller
	cb710: avoid NULL pointer subtraction
	efi/cper: use stack buffer for error record decoding
	efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock()
	usb: musb: dsps: Fix the probe error path
	Input: xpad - add support for another USB ID of Nacon GC-100
	USB: serial: qcserial: add EM9191 QDL support
	USB: serial: option: add Quectel EC200S-CN module support
	USB: serial: option: add Telit LE910Cx composition 0x1204
	USB: serial: option: add prod. id for Quectel EG91
	misc: fastrpc: Add missing lock before accessing find_vma()
	virtio: write back F_VERSION_1 before validate
	EDAC/armada-xp: Fix output of uncorrectable error counter
	nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells
	x86/Kconfig: Do not enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT automatically
	powerpc/xive: Discard disabled interrupts in get_irqchip_state()
	iio: adc: aspeed: set driver data when adc probe.
	drivers: bus: simple-pm-bus: Add support for probing simple bus only devices
	driver core: Reject pointless SYNC_STATE_ONLY device links
	iio: adc: ad7192: Add IRQ flag
	iio: adc: ad7780: Fix IRQ flag
	iio: adc: ad7793: Fix IRQ flag
	iio: adc128s052: Fix the error handling path of 'adc128_probe()'
	iio: adc: max1027: Fix wrong shift with 12-bit devices
	iio: mtk-auxadc: fix case IIO_CHAN_INFO_PROCESSED
	iio: light: opt3001: Fixed timeout error when 0 lux
	iio: adc: max1027: Fix the number of max1X31 channels
	iio: ssp_sensors: add more range checking in ssp_parse_dataframe()
	iio: ssp_sensors: fix error code in ssp_print_mcu_debug()
	iio: dac: ti-dac5571: fix an error code in probe()
	tee: optee: Fix missing devices unregister during optee_remove
	ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address
	ARM: dts: bcm2711: fix MDIO #address- and #size-cells
	ARM: dts: bcm2711-rpi-4-b: fix sd_io_1v8_reg regulator states
	ARM: dts: bcm2711-rpi-4-b: Fix pcie0's unit address formatting
	nvme-pci: Fix abort command id
	sctp: account stream padding length for reconf chunk
	gpio: pca953x: Improve bias setting
	net: arc: select CRC32
	net: korina: select CRC32
	net/mlx5e: Fix memory leak in mlx5_core_destroy_cq() error path
	net/mlx5e: Mutually exclude RX-FCS and RX-port-timestamp
	net: stmmac: fix get_hw_feature() on old hardware
	net: dsa: microchip: Added the condition for scheduling ksz_mib_read_work
	net: encx24j600: check error in devm_regmap_init_encx24j600
	ethernet: s2io: fix setting mac address during resume
	vhost-vdpa: Fix the wrong input in config_cb
	nfc: fix error handling of nfc_proto_register()
	NFC: digital: fix possible memory leak in digital_tg_listen_mdaa()
	NFC: digital: fix possible memory leak in digital_in_send_sdd_req()
	pata_legacy: fix a couple uninitialized variable bugs
	ata: ahci_platform: fix null-ptr-deref in ahci_platform_enable_regulators()
	mlxsw: thermal: Fix out-of-bounds memory accesses
	platform/mellanox: mlxreg-io: Fix argument base in kstrtou32() call
	platform/mellanox: mlxreg-io: Fix read access of n-bytes size attributes
	spi: bcm-qspi: clear MSPI spifie interrupt during probe
	drm/panel: olimex-lcd-olinuxino: select CRC32
	drm/edid: In connector_bad_edid() cap num_of_ext by num_blocks read
	drm/msm: Fix null pointer dereference on pointer edp
	drm/msm/mdp5: fix cursor-related warnings
	drm/msm/a6xx: Track current ctx by seqno
	drm/msm/dsi: Fix an error code in msm_dsi_modeset_init()
	drm/msm/dsi: fix off by one in dsi_bus_clk_enable error handling
	acpi/arm64: fix next_platform_timer() section mismatch error
	platform/x86: intel_scu_ipc: Fix busy loop expiry time
	mqprio: Correct stats in mqprio_dump_class_stats().
	qed: Fix missing error code in qed_slowpath_start()
	r8152: select CRC32 and CRYPTO/CRYPTO_HASH/CRYPTO_SHA256
	nfp: flow_offload: move flow_indr_dev_register from app init to app start
	net: mscc: ocelot: warn when a PTP IRQ is raised for an unknown skb
	ionic: don't remove netdev->dev_addr when syncing uc list
	net: dsa: mv88e6xxx: don't use PHY_DETECT on internal PHY's
	Linux 5.10.75

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0c71baf6e376f0983e4a34d950c2bba7e226b564
tree: 00416f863a1a898b0fbe4ca4931b214e9fb66bc0
  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.x86_64
  45. build.config.gki_kasan
  46. build.config.gki_kasan.aarch64
  47. build.config.gki_kasan.x86_64
  48. build.config.gki_kprobes
  49. build.config.gki_kprobes.aarch64
  50. build.config.gki_kprobes.x86_64
  51. build.config.hikey960
  52. build.config.khwasan
  53. build.config.x86_64
  54. COPYING
  55. CREDITS
  56. Kbuild
  57. Kconfig
  58. MAINTAINERS
  59. Makefile
  60. OWNERS
  61. README
  62. 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)