Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / kernel / shift / mainline / 3c8179ccc65ac450f9abbd6978ca0974d82550cc
commit3c8179ccc65ac450f9abbd6978ca0974d82550cc[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Thu Mar 11 15:52:12 2021 +0100
committerGreg Kroah-Hartman <gregkh@google.com>Thu Mar 11 19:36:03 2021 +0100
treef285c010a4db7c7c64bad8c6ee3a017929fc0dc8
parent6bd3d0211c07d2aa592f286e29ad2dd0a3af52a7 [diff]
parentdfbf345b63c31518e269f7f0adf55bbf57017e23 [diff]
Merge 5.10.23 into android12-5.10

Changes in 5.10.23
	ACPICA: Fix race in generic_serial_bus (I2C) and GPIO op_region parameter handling
	ASoC: SOF: Intel: broadwell: fix mutual exclusion with catpt driver
	nvme-pci: mark Kingston SKC2000 as not supporting the deepest power state
	parisc: Enable -mlong-calls gcc option with CONFIG_COMPILE_TEST
	arm64: Make CPU_BIG_ENDIAN depend on ld.bfd or ld.lld 13.0.0+
	btrfs: export and rename qgroup_reserve_meta
	btrfs: don't flush from btrfs_delayed_inode_reserve_metadata
	iommu/amd: Fix sleeping in atomic in increase_address_space()
	Bluetooth: btqca: Add valid le states quirk
	mwifiex: pcie: skip cancel_work_sync() on reset failure path
	ASoC: Intel: sof_sdw: add quirk for new TigerLake-SDCA device
	bus: ti-sysc: Implement GPMC debug quirk to drop platform data
	platform/x86: acer-wmi: Cleanup ACER_CAP_FOO defines
	platform/x86: acer-wmi: Cleanup accelerometer device handling
	platform/x86: acer-wmi: Add new force_caps module parameter
	platform/x86: acer-wmi: Add ACER_CAP_SET_FUNCTION_MODE capability flag
	platform/x86: acer-wmi: Add support for SW_TABLET_MODE on Switch devices
	platform/x86: acer-wmi: Add ACER_CAP_KBD_DOCK quirk for the Aspire Switch 10E SW3-016
	HID: mf: add support for 0079:1846 Mayflash/Dragonrise USB Gamecube Adapter
	media: cx23885: add more quirks for reset DMA on some AMD IOMMU
	ACPI: video: Add DMI quirk for GIGABYTE GB-BXBT-2807
	ASoC: Intel: bytcr_rt5640: Add quirk for ARCHOS Cesium 140
	usb: cdns3: host: add .suspend_quirk for xhci-plat.c
	usb: cdns3: host: add xhci_plat_priv quirk XHCI_SKIP_PHY_INIT
	usb: cdns3: add quirk for enable runtime pm by default
	usb: cdns3: fix NULL pointer dereference on no platform data
	PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller
	KVM: x86: Supplement __cr4_reserved_bits() with X86_FEATURE_PCID check
	ASoC: Intel: sof_sdw: add missing TGL_HDMI quirk for Dell SKU 0A32
	scsi: ufs-mediatek: Enable UFSHCI_QUIRK_SKIP_MANUAL_WB_FLUSH_CTRL
	scsi: ufs: Add a quirk to permit overriding UniPro defaults
	misc: eeprom_93xx46: Add quirk to support Microchip 93LC46B eeprom
	scsi: ufs: Introduce a quirk to allow only page-aligned sg entries
	scsi: ufs: ufs-exynos: Apply vendor-specific values for three timeouts
	scsi: ufs: ufs-exynos: Use UFSHCD_QUIRK_ALIGN_SG_WITH_PAGE_SIZE
	drm/msm/a5xx: Remove overwriting A5XX_PC_DBG_ECO_CNTL register
	mmc: sdhci-of-dwcmshc: set SDHCI_QUIRK2_PRESET_VALUE_BROKEN
	HID: i2c-hid: Add I2C_HID_QUIRK_NO_IRQ_AFTER_RESET for ITE8568 EC on Voyo Winpad A15
	ALSA: usb-audio: Add DJM750 to Pioneer mixer quirk
	ALSA: usb-audio: add mixer quirks for Pioneer DJM-900NXS2
	PCI: cadence: Retrain Link to work around Gen2 training defect
	ASoC: Intel: sof_sdw: reorganize quirks by generation
	ASoC: Intel: sof_sdw: add quirk for HP Spectre x360 convertible
	scsi: ufs: Fix a duplicate dev quirk number
	KVM: SVM: Clear the CR4 register on reset
	nvme-pci: mark Seagate Nytro XM1440 as QUIRK_NO_NS_DESC_LIST.
	nvme-pci: add quirks for Lexar 256GB SSD
	Linux 5.10.23

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I99cf2bf0177194c562bc3e6c599a1909a0756c50
tree: f285c010a4db7c7c64bad8c6ee3a017929fc0dc8
  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.x86_64
  44. build.config.gki_kasan
  45. build.config.gki_kasan.aarch64
  46. build.config.gki_kasan.x86_64
  47. build.config.gki_kprobes
  48. build.config.gki_kprobes.aarch64
  49. build.config.gki_kprobes.x86_64
  50. build.config.hikey960
  51. build.config.x86_64
  52. COPYING
  53. CREDITS
  54. Kbuild
  55. Kconfig
  56. MAINTAINERS
  57. Makefile
  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.

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