Merge branch 'android12-5.10' of https://android.googlesource.com/ker…

…nel/common into melt-rebase

android/abi_gki_aarch64.xml

@@ -3172,8 +3172,12 @@
       <elf-symbol name='iio_device_free' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x671358a6'/>
       <elf-symbol name='iio_device_release_direct_mode' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xeb7ce92e'/>
       <elf-symbol name='iio_device_unregister' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xaec1e446'/>
+      <elf-symbol name='iio_enum_available_read' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9e0e0a40'/>
+      <elf-symbol name='iio_enum_read' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xeb9fe4b5'/>
+      <elf-symbol name='iio_enum_write' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdbd8db68'/>
       <elf-symbol name='iio_get_channel_type' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5f529dc8'/>
       <elf-symbol name='iio_get_time_ns' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbb47c899'/>
+      <elf-symbol name='iio_pollfunc_store_time' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdf76bbeb'/>
       <elf-symbol name='iio_push_event' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb24f388f'/>
       <elf-symbol name='iio_push_to_buffers' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5f3d694b'/>
       <elf-symbol name='iio_read_channel_attribute' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xec9926ee'/>
@@ -21789,6 +21793,14 @@
         <return type-id='95e97e5e'/>
       </function-type>
       <pointer-type-def type-id='117b6b23' size-in-bits='64' id='25c6126f'/>
+      <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/cfg802154.h' line='233' column='1' id='25cb4d60'>
+        <data-member access='public'>
+          <var-decl name='short_addr' type-id='23119536' visibility='default' filepath='include/net/cfg802154.h' line='234' column='1'/>
+        </data-member>
+        <data-member access='public'>
+          <var-decl name='extended_addr' type-id='a30e8d1f' visibility='default' filepath='include/net/cfg802154.h' line='235' column='1'/>
+        </data-member>
+      </union-decl>
       <class-decl name='xhci_ep_ctx' size-in-bits='256' is-struct='yes' visibility='default' filepath='drivers/usb/host/xhci.h' line='707' column='1' id='25cf7d45'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='ep_info' type-id='2f162548' visibility='default' filepath='drivers/usb/host/xhci.h' line='708' column='1'/>
@@ -41351,6 +41363,17 @@
       <pointer-type-def type-id='f2dcb698' size-in-bits='64' id='57ca5882'/>
       <pointer-type-def type-id='2b4e6dbe' size-in-bits='64' id='57d10d30'/>
       <pointer-type-def type-id='e0c6ffc2' size-in-bits='64' id='57d7488d'/>
+      <class-decl name='ieee802154_addr' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/net/cfg802154.h' line='230' column='1' id='57d8dd3d'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='mode' type-id='f9b06939' visibility='default' filepath='include/net/cfg802154.h' line='231' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='16'>
+          <var-decl name='pan_id' type-id='23119536' visibility='default' filepath='include/net/cfg802154.h' line='232' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='' type-id='25cb4d60' visibility='default' filepath='include/net/cfg802154.h' line='233' column='1'/>
+        </data-member>
+      </class-decl>
       <enum-decl name='thermal_trip_type' filepath='include/uapi/linux/thermal.h' line='12' column='1' id='57e8e954'>
         <underlying-type type-id='9cac1fee'/>
         <enumerator name='THERMAL_TRIP_ACTIVE' value='0'/>
@@ -43160,6 +43183,7 @@
         <return type-id='48b5725f'/>
       </function-type>
       <pointer-type-def type-id='86607661' size-in-bits='64' id='5afa70dd'/>
+      <pointer-type-def type-id='bb1a67f7' size-in-bits='64' id='5afbd3c3'/>
       <pointer-type-def type-id='537d88b1' size-in-bits='64' id='5afdaa66'/>
       <array-type-def dimensions='1' type-id='7799da43' size-in-bits='256' id='5b02a6fc'>
         <subrange length='2' type-id='7ff19f0f' id='52efc4ef'/>
@@ -55829,6 +55853,7 @@
       <pointer-type-def type-id='70084cf7' size-in-bits='64' id='78efe913'/>
       <pointer-type-def type-id='cf081899' size-in-bits='64' id='78faece1'/>
       <qualified-type-def type-id='8a1bdab0' const='yes' id='78fc3761'/>
+      <pointer-type-def type-id='ff37489f' size-in-bits='64' id='790774ef'/>
       <function-type size-in-bits='64' id='7908d890'>
         <parameter type-id='5e4f599b'/>
         <return type-id='48b5725f'/>
@@ -63816,7 +63841,65 @@
           <var-decl name='vtd' type-id='8b85ffcf' visibility='default' filepath='include/uapi/linux/iommu.h' line='337' column='1'/>
         </data-member>
       </union-decl>
-      <class-decl name='wpan_dev' is-struct='yes' visibility='default' is-declaration-only='yes' id='8ae2fb1d'/>
+      <class-decl name='wpan_dev' size-in-bits='704' is-struct='yes' visibility='default' filepath='include/net/cfg802154.h' line='327' column='1' id='8ae2fb1d'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='wpan_phy' type-id='82398c35' visibility='default' filepath='include/net/cfg802154.h' line='328' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='iftype' type-id='95e97e5e' visibility='default' filepath='include/net/cfg802154.h' line='329' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/net/cfg802154.h' line='332' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='256'>
+          <var-decl name='netdev' type-id='68a2d05b' visibility='default' filepath='include/net/cfg802154.h' line='333' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='320'>
+          <var-decl name='header_ops' type-id='790774ef' visibility='default' filepath='include/net/cfg802154.h' line='335' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='384'>
+          <var-decl name='lowpan_dev' type-id='68a2d05b' visibility='default' filepath='include/net/cfg802154.h' line='338' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='448'>
+          <var-decl name='identifier' type-id='19c2251e' visibility='default' filepath='include/net/cfg802154.h' line='340' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='480'>
+          <var-decl name='pan_id' type-id='23119536' visibility='default' filepath='include/net/cfg802154.h' line='343' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='496'>
+          <var-decl name='short_addr' type-id='23119536' visibility='default' filepath='include/net/cfg802154.h' line='344' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='512'>
+          <var-decl name='extended_addr' type-id='a30e8d1f' visibility='default' filepath='include/net/cfg802154.h' line='345' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='576'>
+          <var-decl name='bsn' type-id='49178f86' visibility='default' filepath='include/net/cfg802154.h' line='348' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='608'>
+          <var-decl name='dsn' type-id='49178f86' visibility='default' filepath='include/net/cfg802154.h' line='350' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='640'>
+          <var-decl name='min_be' type-id='f9b06939' visibility='default' filepath='include/net/cfg802154.h' line='352' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='648'>
+          <var-decl name='max_be' type-id='f9b06939' visibility='default' filepath='include/net/cfg802154.h' line='353' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='656'>
+          <var-decl name='csma_retries' type-id='f9b06939' visibility='default' filepath='include/net/cfg802154.h' line='354' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='664'>
+          <var-decl name='frame_retries' type-id='fdbf7a0f' visibility='default' filepath='include/net/cfg802154.h' line='355' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='672'>
+          <var-decl name='lbt' type-id='b50a4934' visibility='default' filepath='include/net/cfg802154.h' line='357' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='680'>
+          <var-decl name='promiscuous_mode' type-id='b50a4934' visibility='default' filepath='include/net/cfg802154.h' line='359' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='688'>
+          <var-decl name='ackreq' type-id='b50a4934' visibility='default' filepath='include/net/cfg802154.h' line='362' column='1'/>
+        </data-member>
+      </class-decl>
       <enum-decl name='dma_desc_metadata_mode' filepath='include/linux/dmaengine.h' line='289' column='1' id='8ae66bc4'>
         <underlying-type type-id='9cac1fee'/>
         <enumerator name='DESC_METADATA_NONE' value='0'/>
@@ -67828,6 +67911,9 @@
         <parameter type-id='78c01427'/>
         <return type-id='95e97e5e'/>
       </function-type>
+      <array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='2048' id='93e41790'>
+        <subrange length='64' type-id='7ff19f0f' id='b10be967'/>
+      </array-type-def>
       <pointer-type-def type-id='42b001af' size-in-bits='64' id='93edac17'/>
       <array-type-def dimensions='1' type-id='3b0abfc6' size-in-bits='768' id='93f82aba'>
         <subrange length='6' type-id='7ff19f0f' id='52fa524b'/>
@@ -68653,6 +68739,11 @@
       </function-type>
       <pointer-type-def type-id='21767af6' size-in-bits='64' id='95e6deec'/>
       <type-decl name='int' size-in-bits='32' id='95e97e5e'/>
+      <class-decl name='wpan_dev_header_ops' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/net/cfg802154.h' line='316' column='1' id='95fcbc94'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='create' type-id='5afbd3c3' visibility='default' filepath='include/net/cfg802154.h' line='321' column='1'/>
+        </data-member>
+      </class-decl>
       <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/if.h' line='241' column='1' id='95fd560f'>
         <data-member access='public'>
           <var-decl name='ifru_addr' type-id='5221b18a' visibility='default' filepath='include/uapi/linux/if.h' line='242' column='1'/>
@@ -78438,7 +78529,11 @@
       <pointer-type-def type-id='512ac7cc' size-in-bits='64' id='ac58af12'/>
       <pointer-type-def type-id='b254b8db' size-in-bits='64' id='ac5f2363'/>
       <pointer-type-def type-id='49a0ad34' size-in-bits='64' id='ac6963b2'/>
-      <class-decl name='prot_inuse' is-struct='yes' visibility='default' is-declaration-only='yes' id='ac763c5d'/>
+      <class-decl name='prot_inuse' size-in-bits='2048' is-struct='yes' visibility='default' filepath='net/core/sock.c' line='3371' column='1' id='ac763c5d'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='val' type-id='93e41790' visibility='default' filepath='net/core/sock.c' line='3372' column='1'/>
+        </data-member>
+      </class-decl>
       <function-type size-in-bits='64' id='ac765b39'>
         <parameter type-id='2ba25712'/>
         <parameter type-id='14bde5bf'/>
@@ -84580,6 +84675,7 @@
         </data-member>
       </union-decl>
       <pointer-type-def type-id='43489bca' size-in-bits='64' id='ba18e248'/>
+      <pointer-type-def type-id='d37aa9fa' size-in-bits='64' id='ba195270'/>
       <pointer-type-def type-id='d9609309' size-in-bits='64' id='ba1d878d'/>
       <pointer-type-def type-id='e82a9f1d' size-in-bits='64' id='ba21bbb1'/>
       <pointer-type-def type-id='636cc9ab' size-in-bits='64' id='ba21e62b'/>
@@ -85124,6 +85220,14 @@
       </class-decl>
       <pointer-type-def type-id='a9ab8935' size-in-bits='64' id='bb0baf11'/>
       <pointer-type-def type-id='9bc083a1' size-in-bits='64' id='bb0f13d1'/>
+      <function-type size-in-bits='64' id='bb1a67f7'>
+        <parameter type-id='0fbf3cfd'/>
+        <parameter type-id='68a2d05b'/>
+        <parameter type-id='ba195270'/>
+        <parameter type-id='ba195270'/>
+        <parameter type-id='f0981eeb'/>
+        <return type-id='95e97e5e'/>
+      </function-type>
       <class-decl name='rdists' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/irqchip/arm-gic-v3.h' line='668' column='1' id='bb1c0d96'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='rdist' type-id='8567d8b0' visibility='default' filepath='include/linux/irqchip/arm-gic-v3.h' line='677' column='1'/>
@@ -96829,6 +96933,7 @@
       <pointer-type-def type-id='0ad12489' size-in-bits='64' id='d3769ffd'/>
       <pointer-type-def type-id='4dedc1bb' size-in-bits='64' id='d379869f'/>
       <pointer-type-def type-id='08dd4249' size-in-bits='64' id='d37a2705'/>
+      <qualified-type-def type-id='57d8dd3d' const='yes' id='d37aa9fa'/>
       <class-decl name='usb_cdc_union_desc' size-in-bits='40' is-struct='yes' visibility='default' filepath='include/uapi/linux/usb/cdc.h' line='101' column='1' id='d37cd54e'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='bLength' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/usb/cdc.h' line='102' column='1'/>
@@ -116994,6 +117099,7 @@
           <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fdtable.h' line='33' column='1'/>
         </data-member>
       </class-decl>
+      <qualified-type-def type-id='95fcbc94' const='yes' id='ff37489f'/>
       <class-decl name='timerqueue_head' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/timerqueue.h' line='14' column='1' id='ff3c7f20'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='rb_root' type-id='6fe1603d' visibility='default' filepath='include/linux/timerqueue.h' line='15' column='1'/>
@@ -135201,6 +135307,28 @@
         <parameter type-id='226853d2' name='indio_dev' filepath='drivers/iio/industrialio-core.c' line='1797' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='iio_enum_available_read' mangled-name='iio_enum_available_read' filepath='drivers/iio/industrialio-core.c' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_enum_available_read'>
+        <parameter type-id='226853d2' name='indio_dev' filepath='drivers/iio/industrialio-core.c' line='463' column='1'/>
+        <parameter type-id='e475ab95' name='priv' filepath='drivers/iio/industrialio-core.c' line='464' column='1'/>
+        <parameter type-id='f74174a4' name='chan' filepath='drivers/iio/industrialio-core.c' line='464' column='1'/>
+        <parameter type-id='26a90f95' name='buf' filepath='drivers/iio/industrialio-core.c' line='464' column='1'/>
+        <return type-id='79a0948f'/>
+      </function-decl>
+      <function-decl name='iio_enum_read' mangled-name='iio_enum_read' filepath='drivers/iio/industrialio-core.c' line='483' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_enum_read'>
+        <parameter type-id='226853d2' name='indio_dev' filepath='drivers/iio/industrialio-core.c' line='483' column='1'/>
+        <parameter type-id='e475ab95' name='priv' filepath='drivers/iio/industrialio-core.c' line='484' column='1'/>
+        <parameter type-id='f74174a4' name='chan' filepath='drivers/iio/industrialio-core.c' line='484' column='1'/>
+        <parameter type-id='26a90f95' name='buf' filepath='drivers/iio/industrialio-core.c' line='484' column='1'/>
+        <return type-id='79a0948f'/>
+      </function-decl>
+      <function-decl name='iio_enum_write' mangled-name='iio_enum_write' filepath='drivers/iio/industrialio-core.c' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_enum_write'>
+        <parameter type-id='226853d2' name='indio_dev' filepath='drivers/iio/industrialio-core.c' line='502' column='1'/>
+        <parameter type-id='e475ab95' name='priv' filepath='drivers/iio/industrialio-core.c' line='503' column='1'/>
+        <parameter type-id='f74174a4' name='chan' filepath='drivers/iio/industrialio-core.c' line='503' column='1'/>
+        <parameter type-id='80f4b756' name='buf' filepath='drivers/iio/industrialio-core.c' line='503' column='1'/>
+        <parameter type-id='b59d7dce' name='len' filepath='drivers/iio/industrialio-core.c' line='504' column='1'/>
+        <return type-id='79a0948f'/>
+      </function-decl>
       <function-decl name='iio_get_channel_type' mangled-name='iio_get_channel_type' filepath='drivers/iio/inkern.c' line='833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_get_channel_type'>
         <parameter type-id='2712709a' name='chan' filepath='drivers/iio/inkern.c' line='833' column='1'/>
         <parameter type-id='4a2371f8' name='type' filepath='drivers/iio/inkern.c' line='833' column='1'/>
@@ -135210,6 +135338,11 @@
         <parameter type-id='78041e8f' name='indio_dev' filepath='drivers/iio/industrialio-core.c' line='240' column='1'/>
         <return type-id='9b7c55ef'/>
       </function-decl>
+      <function-decl name='iio_pollfunc_store_time' mangled-name='iio_pollfunc_store_time' filepath='drivers/iio/industrialio-trigger.c' line='315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_pollfunc_store_time'>
+        <parameter type-id='95e97e5e' name='irq' filepath='drivers/iio/industrialio-trigger.c' line='315' column='1'/>
+        <parameter type-id='eaa32e2f' name='p' filepath='drivers/iio/industrialio-trigger.c' line='315' column='1'/>
+        <return type-id='4bdecfd7'/>
+      </function-decl>
       <function-decl name='iio_push_event' mangled-name='iio_push_event' filepath='drivers/iio/industrialio-event.c' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_push_event'>
         <parameter type-id='226853d2' name='indio_dev' filepath='drivers/iio/industrialio-event.c' line='64' column='1'/>
         <parameter type-id='91ce1af9' name='ev_code' filepath='drivers/iio/industrialio-event.c' line='64' column='1'/>