tag	390c2a8c9abf8cc974b43bb0a06416b23d4be77e
tagger	Todd Kjos <tkjos@google.com>	Wed Aug 24 09:07:13 2022 -0700
object	ee965fe12def46132d0087a9f353750d717e717c

commit	ee965fe12def46132d0087a9f353750d717e717c	[log] [tgz]
author	Greg Kroah-Hartman <gregkh@google.com>	Tue Aug 16 12:45:36 2022 +0200
committer	Greg Kroah-Hartman <gregkh@google.com>	Tue Aug 16 14:34:54 2022 +0200
tree	9c6b68f959c676016ae21e0fb4da641921e84fe6
parent	b7247246f63714e4b13e43aa0ba0ba9ec900cc5c [diff]
parent	fb39cdb9eac1fc2a202cefe6a10500dcddfa37bd [diff]

Merge branch 'android12-5.10' into branch 'android12-5.10-lts'

Sync up with android12-5.10 for the following commits:

fb39cdb9eac1 ANDROID: export reclaim_pages
1f8f6d59a298 ANDROID: vendor_hook: Add hook to not be stuck ro rmap lock in kswapd or direct_reclaim
91bfc78bc009 ANDROID: Update symbol list for mtk
02df0b2661e0 ANDROID: GKI: rockchip: Add symbols for crypto
efdf581d14e3 ANDROID: GKI: rockchip: Add symbol pci_disable_link_state
504ce2d3a617 ANDROID: GKI: rockchip: Add symbols for sound
a6b6bc98b7bc ANDROID: GKI: rockchip: Add symbols for video
f3a311b456ce BACKPORT: f2fs: do not set compression bit if kernel doesn't support
b0988144b0b0 UPSTREAM: exfat: improve performance of exfat_free_cluster when using dirsync mount
00d3b8c0ccac ANDROID: GKI: rockchip: Add symbols for drm dp
936f1e35d1e5 UPSTREAM: arm64: perf: Support new DT compatibles
ed931dc8ff1d UPSTREAM: arm64: perf: Simplify registration boilerplate
bb6c018ab6f3 UPSTREAM: arm64: perf: Support Denver and Carmel PMUs
d306fd9d476f UPSTREAM: arm64: perf: add support for Cortex-A78
09f78c3f7e40 ANDROID: GKI: rockchip: Update symbol for devfreq
e7ed66854e89 ANDROID: GKI: rockchip: Update symbols for drm
a3e70ff5bf64 ANDROID: GKI: Update symbols to symbol list
a09241c6dd68 UPSTREAM: ASoC: hdmi-codec: make hdmi_codec_controls static
9eda09e511f6 UPSTREAM: ASoC: hdmi-codec: Add a prepare hook
4ad97b395f94 UPSTREAM: ASoC: hdmi-codec: Add iec958 controls
c0c2f6962d94 UPSTREAM: ASoC: hdmi-codec: Rework to support more controls
4c6eb3db8a8b UPSTREAM: ALSA: iec958: Split status creation and fill
580d2e7c78b2 UPSTREAM: ALSA: doc: Clarify IEC958 controls iface
8b4bb1bca077 UPSTREAM: ASoC: hdmi-codec: remove unused spk_mask member
5a2c4a5d1e94 UPSTREAM: ASoC: hdmi-codec: remove useless initialization
49e502f0c048 UPSTREAM: ASoC: codec: hdmi-codec: Support IEC958 encoded PCM format
9bf69acb92d1 UPSTREAM: ASoC: hdmi-codec: Fix return value in hdmi_codec_set_jack()
056409c7dc30 UPSTREAM: ASoC: hdmi-codec: Add RX support
5e75deab3acc UPSTREAM: ASoC: hdmi-codec: Get ELD in before reporting plugged event
d6207c39cb09 ANDROID: GKI: rockchip: Add symbols for display driver
1c3ed9d4819b BACKPORT: KVM: x86/mmu: fix NULL pointer dereference on guest INVPCID
843d3cb41b0f BACKPORT: io_uring: always grab file table for deferred statx
784cc16aede4 BACKPORT: Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put
2b377175a35e ANDROID: add two func in mm/memcontrol.c
e56f8712cffc ANDROID: vendor_hooks: protect multi-mapcount pages in kernel
3f775b936704 ANDROID: vendor_hooks: account page-mapcount
1d2287f56e98 FROMGIT: io_uring: Use original task for req identity in io_identity_cow()
e0c9da25b2ba FROMLIST: binder: fix UAF of ref->proc caused by race condition
12f43224422a ANDROID: vendor_hooks: Guard cgroup struct with CONFIG_CGROUPS
6532784c7853 ANDROID: vendor_hooks: add hooks for remove_vm_area.
c9a70dd5923e ANDROID: GKI: allow mm vendor hooks header inclusion from header files
039080d064d9 ANDROID: Update symbol list of mediatek
9e8dedef1e89 ANDROID: sched: add vendor hook to PELT multiplier
573c7f061d10 ANDROID: Guard hooks with their CONFIG_ options
14f646cca5c7 ANDROID: fix kernelci issue for allnoconfig builds
4442801a43f3 ANDROID: sched: Introducing PELT multiplier
b2e5773ea411 FROMGIT: binder: fix redefinition of seq_file attributes
9c2a5eef8fbd Merge tag 'android12-5.10.117_r00' into 'android12-5.10'
5fa1e1affc12 ANDROID: GKI: pcie: Fix the broken dw_pcie structure
51b3e1707114 UPSTREAM: PCI: dwc: Support multiple ATU memory regions
a8d7f6518eae ANDROID: oplus: Update the ABI xml and symbol list
4536de1b708c ANDROID: vendor_hooks: add hooks in __alloc_pages_slowpath
d63c961c9df4 ANDROID: GKI: Update symbols to symbol list
41cbbe08f9fb FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctls
c301d142e807 FROMGIT: usb: dwc3: core: Do not perform GCTL_CORE_SOFTRESET during bootup
8b19ed264b40 ANDROID: vendor_hooks:vendor hook for mmput
242b11e57460 ANDROID: vendor_hooks:vendor hook for pidfd_open
0e1cb2770027 ANDROID: vendor_hook: Add hook in shmem_writepage()
8ee37d0bcd40 BACKPORT: iommu/dma: Fix race condition during iova_domain initialization
321bf845e1d1 FROMGIT: usb: dwc3: core: Deprecate GCTL.CORESOFTRESET
c5eb0edfde99 FROMGIT: usb: dwc3: gadget: Prevent repeat pullup()
8de633b735bf FROMGIT: Binder: add TF_UPDATE_TXN to replace outdated txn
e8fce594347a BACKPORT: FROMGIT: cgroup: Use separate src/dst nodes when preloading css_sets for migration
f26c566455d8 UPSTREAM: usb: gadget: f_uac2: allow changing interface name via configfs
98fa7f7dfd54 UPSTREAM: usb: gadget: f_uac1: allow changing interface name via configfs
29172165ca61 UPSTREAM: usb: gadget: f_uac1: Add suspend callback
ff5468c71eed UPSTREAM: usb: gadget: f_uac2: Add suspend callback
31e6d620c197 UPSTREAM: usb: gadget: u_audio: Add suspend call
17643c1fdde0 UPSTREAM: usb: gadget: u_audio: Rate ctl notifies about current srate (0=stopped)
308955e3a605 UPSTREAM: usb: gadget: f_uac1: Support multiple sampling rates
ae03eadb425c UPSTREAM: usb: gadget: f_uac2: Support multiple sampling rates
bedc53fae42a UPSTREAM: usb: gadget:audio: Replace deprecated macro S_IRUGO
37e0d5eddb56 UPSTREAM: usb: gadget: u_audio: Add capture/playback srate getter
3251bb32508e UPSTREAM: usb: gadget: u_audio: Move dynamic srate from params to rtd
530916be9777 UPSTREAM: usb: gadget: u_audio: Support multiple sampling rates
7f496d5a99b6 UPSTREAM: docs: ABI: fixed formatting in configfs-usb-gadget-uac2
2500cb53e619 UPSTREAM: usb: gadget: u_audio: Subdevice 0 for capture ctls
c386f34bd49d UPSTREAM: usb: gadget: u_audio: fix calculations for small bInterval
f74e3e2fe4fe UPSTREAM: docs: ABI: fixed req_number desc in UAC1
02949bae5c14 UPSTREAM: docs: ABI: added missing num_requests param to UAC2
e1377ac38f4d UPSTREAM: usb:gadget: f_uac1: fixed sync playback
4b7c8905c56d UPSTREAM: usb: gadget: u_audio.c: Adding Playback Pitch ctl for sync playback
e29d2b51783e UPSTREAM: ABI: configfs-usb-gadget-uac2: fix a broken table
ec313ae88d6c UPSTREAM: ABI: configfs-usb-gadget-uac1: fix a broken table
bf46bbe087ba UPSTREAM: usb: gadget: f_uac1: fixing inconsistent indenting
b9c4cbbf7a4b UPSTREAM: docs: usb: fix malformed table
a380b466e0c2 UPSTREAM: usb: gadget: f_uac1: add volume and mute support
e2c0816af2f2 BACKPORT: usb: gadget: f_uac2: add volume and mute support
8430eb02434d UPSTREAM: usb: gadget: u_audio: add bi-directional volume and mute support
257d21b1848a UPSTREAM: usb: audio-v2: add ability to define feature unit descriptor
10027474294d ANDROID: mm: shmem: use reclaim_pages() to recalim pages from a list
67197631871c UPSTREAM: usb: gadget: f_uac1: disable IN/OUT ep if unused

And add the new symbols being tracked due to abi additions from the
android12-5.10 branch:

Leaf changes summary: 85 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 69 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 16 Added variables

69 Added functions:

  [A] 'function void __dev_kfree_skb_irq(sk_buff*, skb_free_reason)'
  [A] 'function int __page_mapcount(page*)'
  [A] 'function int __traceiter_android_vh_add_page_to_lrulist(void*, page*, bool, lru_list)'
  [A] 'function int __traceiter_android_vh_alloc_pages_slowpath_begin(void*, gfp_t, unsigned int, unsigned long int*)'
  [A] 'function int __traceiter_android_vh_alloc_pages_slowpath_end(void*, gfp_t, unsigned int, unsigned long int)'
  [A] 'function int __traceiter_android_vh_del_page_from_lrulist(void*, page*, bool, lru_list)'
  [A] 'function int __traceiter_android_vh_do_traversal_lruvec(void*, lruvec*)'
  [A] 'function int __traceiter_android_vh_mark_page_accessed(void*, page*)'
  [A] 'function int __traceiter_android_vh_mutex_unlock_slowpath_end(void*, mutex*, task_struct*)'
  [A] 'function int __traceiter_android_vh_page_should_be_protected(void*, page*, bool*)'
  [A] 'function int __traceiter_android_vh_rwsem_mark_wake_readers(void*, rw_semaphore*, rwsem_waiter*)'
  [A] 'function int __traceiter_android_vh_rwsem_set_owner(void*, rw_semaphore*)'
  [A] 'function int __traceiter_android_vh_rwsem_set_reader_owned(void*, rw_semaphore*)'
  [A] 'function int __traceiter_android_vh_rwsem_up_read_end(void*, rw_semaphore*)'
  [A] 'function int __traceiter_android_vh_rwsem_up_write_end(void*, rw_semaphore*)'
  [A] 'function int __traceiter_android_vh_sched_pelt_multiplier(void*, unsigned int, unsigned int, int*)'
  [A] 'function int __traceiter_android_vh_show_mapcount_pages(void*, void*)'
  [A] 'function int __traceiter_android_vh_update_page_mapcount(void*, page*, bool, bool, bool*, bool*)'
  [A] 'function int __v4l2_ctrl_handler_setup(v4l2_ctrl_handler*)'
  [A] 'function int crypto_ahash_final(ahash_request*)'
  [A] 'function crypto_akcipher* crypto_alloc_akcipher(const char*, u32, u32)'
  [A] 'function int crypto_register_akcipher(akcipher_alg*)'
  [A] 'function void crypto_unregister_akcipher(akcipher_alg*)'
  [A] 'function int des_expand_key(des_ctx*, const u8*, unsigned int)'
  [A] 'function void dev_pm_opp_unregister_set_opp_helper(opp_table*)'
  [A] 'function net_device* devm_alloc_etherdev_mqs(device*, int, unsigned int, unsigned int)'
  [A] 'function mii_bus* devm_mdiobus_alloc_size(device*, int)'
  [A] 'function int devm_of_mdiobus_register(device*, mii_bus*, device_node*)'
  [A] 'function int devm_register_netdev(device*, net_device*)'
  [A] 'function bool disable_hardirq(unsigned int)'
  [A] 'function void do_traversal_all_lruvec()'
  [A] 'function drm_connector_status drm_bridge_detect(drm_bridge*)'
  [A] 'function edid* drm_bridge_get_edid(drm_bridge*, drm_connector*)'
  [A] 'function int drm_bridge_get_modes(drm_bridge*, drm_connector*)'
  [A] 'function int drm_dp_get_phy_test_pattern(drm_dp_aux*, drm_dp_phy_test_params*)'
  [A] 'function int drm_dp_read_desc(drm_dp_aux*, drm_dp_desc*, bool)'
  [A] 'function int drm_dp_read_dpcd_caps(drm_dp_aux*, u8*)'
  [A] 'function int drm_dp_read_sink_count(drm_dp_aux*)'
  [A] 'function int drm_dp_set_phy_test_pattern(drm_dp_aux*, drm_dp_phy_test_params*, u8)'
  [A] 'function uint64_t drm_format_info_min_pitch(const drm_format_info*, int, unsigned int)'
  [A] 'function int drm_mm_reserve_node(drm_mm*, drm_mm_node*)'
  [A] 'function bool drm_probe_ddc(i2c_adapter*)'
  [A] 'function void drm_self_refresh_helper_cleanup(drm_crtc*)'
  [A] 'function int drm_self_refresh_helper_init(drm_crtc*)'
  [A] 'function int get_pelt_halflife()'
  [A] 'function ssize_t hdmi_avi_infoframe_pack_only(const hdmi_avi_infoframe*, void*, size_t)'
  [A] 'function ssize_t iio_read_const_attr(device*, device_attribute*, char*)'
  [A] 'function bool mipi_dsi_packet_format_is_short(u8)'
  [A] 'function platform_device* of_device_alloc(device_node*, const char*, device*)'
  [A] 'function lruvec* page_to_lruvec(page*, pg_data_t*)'
  [A] 'function int pci_disable_link_state(pci_dev*, int)'
  [A] 'function int regmap_test_bits(regmap*, unsigned int, unsigned int)'
  [A] 'function unsigned int regulator_get_linear_step(regulator*)'
  [A] 'function int regulator_suspend_enable(regulator_dev*, suspend_state_t)'
  [A] 'function int rsa_parse_priv_key(rsa_key*, void*, unsigned int)'
  [A] 'function int rsa_parse_pub_key(rsa_key*, void*, unsigned int)'
  [A] 'function int sg_nents(scatterlist*)'
  [A] 'function int snd_pcm_create_iec958_consumer_default(u8*, size_t)'
  [A] 'function int snd_pcm_fill_iec958_consumer(snd_pcm_runtime*, u8*, size_t)'
  [A] 'function int snd_pcm_fill_iec958_consumer_hw_params(snd_pcm_hw_params*, u8*, size_t)'
  [A] 'function int snd_soc_dapm_force_bias_level(snd_soc_dapm_context*, snd_soc_bias_level)'
  [A] 'function int snd_soc_jack_add_zones(snd_soc_jack*, int, snd_soc_jack_zone*)'
  [A] 'function int snd_soc_jack_get_type(snd_soc_jack*, int)'
  [A] 'function void tcpm_tcpc_reset(tcpm_port*)'
  [A] 'function int v4l2_enum_dv_timings_cap(v4l2_enum_dv_timings*, const v4l2_dv_timings_cap*, v4l2_check_dv_timings_fnc*, void*)'
  [A] 'function void v4l2_print_dv_timings(const char*, const char*, const v4l2_dv_timings*, bool)'
  [A] 'function int v4l2_src_change_event_subdev_subscribe(v4l2_subdev*, v4l2_fh*, v4l2_event_subscription*)'
  [A] 'function void v4l2_subdev_notify_event(v4l2_subdev*, const v4l2_event*)'
  [A] 'function bool v4l2_valid_dv_timings(const v4l2_dv_timings*, const v4l2_dv_timings_cap*, v4l2_check_dv_timings_fnc*, void*)'

16 Added variables:

  [A] 'tracepoint __tracepoint_android_vh_add_page_to_lrulist'
  [A] 'tracepoint __tracepoint_android_vh_alloc_pages_slowpath_begin'
  [A] 'tracepoint __tracepoint_android_vh_alloc_pages_slowpath_end'
  [A] 'tracepoint __tracepoint_android_vh_del_page_from_lrulist'
  [A] 'tracepoint __tracepoint_android_vh_do_traversal_lruvec'
  [A] 'tracepoint __tracepoint_android_vh_mark_page_accessed'
  [A] 'tracepoint __tracepoint_android_vh_mutex_unlock_slowpath_end'
  [A] 'tracepoint __tracepoint_android_vh_page_should_be_protected'
  [A] 'tracepoint __tracepoint_android_vh_rwsem_mark_wake_readers'
  [A] 'tracepoint __tracepoint_android_vh_rwsem_set_owner'
  [A] 'tracepoint __tracepoint_android_vh_rwsem_set_reader_owned'
  [A] 'tracepoint __tracepoint_android_vh_rwsem_up_read_end'
  [A] 'tracepoint __tracepoint_android_vh_rwsem_up_write_end'
  [A] 'tracepoint __tracepoint_android_vh_sched_pelt_multiplier'
  [A] 'tracepoint __tracepoint_android_vh_show_mapcount_pages'
  [A] 'tracepoint __tracepoint_android_vh_update_page_mapcount'

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I47eefe85b949d3f358da95a9b6553660b9be0791

tree: 9c6b68f959c676016ae21e0fb4da641921e84fe6

README.md

How do I submit patches to Android Common Kernels

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

How do I submit patches to Android Common Kernels

Common Kernel patch requirements

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

Requirements for other backports: FROMGIT:, FROMLIST:,

Requirements for Android-specific patches: ANDROID:

Requirements for backports from mainline Linux: `UPSTREAM:`, `BACKPORT:`

Requirements for other backports: `FROMGIT:`, `FROMLIST:`,

Requirements for Android-specific patches: `ANDROID:`