Merge "Merge android11-5.4.60 (8ae87ad) into msm-5.4" (d0bd7d0e) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/sysfs-bus-iio

+2 −1

Original line number	Diff line number	Diff line
		@@ -1566,7 +1566,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
		KernelVersion: 4.3
		Contact: linux-iio@vger.kernel.org
		Description:
		Raw (unscaled no offset etc.) percentage reading of a substance.
		Raw (unscaled no offset etc.) reading of a substance. Units
		after application of scale and offset are percents.

		What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw
		What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw

Makefile

+2 −2

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 58
		SUBLEVEL = 60
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

		@@ -885,7 +885,7 @@ LD_FLAGS_LTO_CLANG := -mllvm -import-instr-limit=5
		KBUILD_LDFLAGS += $(LD_FLAGS_LTO_CLANG)
		KBUILD_LDFLAGS_MODULE += $(LD_FLAGS_LTO_CLANG)

		KBUILD_LDS_MODULE += scripts/module-lto.lds
		KBUILD_LDS_MODULE += $(srctree)/scripts/module-lto.lds
		endif

		ifdef CONFIG_LTO

android/abi_gki_aarch64.xml

+6008 −6012

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_3a9b53bc89.xml→android/abi_gki_aarch64_8ae87ad4df.xml

+6147 −5222

File changed and moved.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+50 −0

Original line number	Diff line number	Diff line
		@@ -858,6 +858,7 @@
		eth_commit_mac_addr_change
		ether_setup
		eth_mac_addr
		eth_platform_get_mac_address
		eth_prepare_mac_addr_change
		__ethtool_get_link_ksettings
		ethtool_op_get_link
		@@ -938,12 +939,14 @@
		generic_file_read_iter
		generic_file_splice_read
		generic_handle_irq
		generic_mii_ioctl
		generic_permission
		generic_read_dir
		generic_shutdown_super
		genlmsg_put
		genl_register_family
		genl_unregister_family
		genphy_resume
		gen_pool_add_owner
		gen_pool_alloc_algo_owner
		gen_pool_avail
		@@ -1082,6 +1085,7 @@
		idr_preload
		idr_remove
		idr_replace
		ieee80211_channel_to_freq_khz
		ieee80211_freq_khz_to_channel
		ieee80211_get_channel_khz
		ieee80211_hdrlen
		@@ -1351,6 +1355,10 @@
		mbox_free_channel
		mbox_request_channel
		mbox_send_message
		mdiobus_alloc_size
		mdiobus_free
		__mdiobus_register
		mdiobus_unregister
		media_create_pad_link
		media_device_cleanup
		media_device_init
		@@ -1371,6 +1379,12 @@
		__memset_io
		memunmap
		memweight
		mii_check_media
		mii_ethtool_get_link_ksettings
		mii_ethtool_gset
		mii_ethtool_set_link_ksettings
		mii_link_ok
		mii_nway_restart
		mipi_dsi_create_packet
		mipi_dsi_dcs_set_display_brightness
		mipi_dsi_dcs_set_tear_off
		@@ -1652,13 +1666,22 @@
		perf_trace_run_bpf_submit
		pfn_valid
		phy_calibrate
		phy_connect
		phy_disconnect
		phy_ethtool_get_link_ksettings
		phy_ethtool_nway_reset
		phy_ethtool_set_link_ksettings
		phy_exit
		phy_init
		phy_mii_ioctl
		phy_pm_runtime_get_sync
		phy_pm_runtime_put_sync
		phy_power_off
		phy_power_on
		phy_print_status
		phy_set_mode_ext
		phy_start
		phy_stop
		physvirt_offset
		pinconf_generic_dt_node_to_map
		pinctrl_dev_get_drvdata
		@@ -2575,6 +2598,33 @@
		usb_kill_urb
		usb_lock_device_for_reset
		usb_match_one_id
		usbnet_change_mtu
		usbnet_disconnect
		usbnet_get_drvinfo
		usbnet_get_endpoints
		usbnet_get_link
		usbnet_get_link_ksettings
		usbnet_get_msglevel
		usbnet_get_stats64
		usbnet_link_change
		usbnet_nway_reset
		usbnet_open
		usbnet_probe
		usbnet_read_cmd
		usbnet_read_cmd_nopm
		usbnet_resume
		usbnet_set_link_ksettings
		usbnet_set_msglevel
		usbnet_skb_return
		usbnet_start_xmit
		usbnet_stop
		usbnet_suspend
		usbnet_tx_timeout
		usbnet_unlink_rx_urbs
		usbnet_update_max_qlen
		usbnet_write_cmd
		usbnet_write_cmd_async
		usbnet_write_cmd_nopm
		usb_os_desc_prepare_interf_dir
		usb_poison_urb
		usb_put_dev