Commit be455bc5 authored Aug 06, 2020 by Blagovest Kolenichev

Merge android11-5.4.55 (53b501f1) into msm-5.4



* refs/heads/tmp-53b501f1:
  Revert "qrtr: orphan socket in qrtr_release()"
  ANDROID: GKI: fix up abi definition files
  Revert "ANDROID: GKI: Enable CONFIG_USB_DWC3"
  ANDROID: GKI: remove symbols from sunxi for uas driver
  Linux 5.4.55
  Revert "dpaa_eth: fix usage as DSA master, try 3"
  PM: wakeup: Show statistics for deleted wakeup sources again
  regmap: debugfs: check count when read regmap file
  udp: Improve load balancing for SO_REUSEPORT.
  udp: Copy has_conns in reuseport_grow().
  sctp: shrink stream outq when fails to do addstream reconf
  sctp: shrink stream outq only when new outcnt < old outcnt
  AX.25: Prevent integer overflows in connect and sendmsg
  tcp: allow at most one TLP probe per flight
  rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA
  rtnetlink: Fix memory(net_device) leak when ->newlink fails
  qrtr: orphan socket in qrtr_release()
  net: udp: Fix wrong clean up for IS_UDPLITE macro
  net-sysfs: add a newline when printing 'tx_timeout' by sysfs
  ip6_gre: fix null-ptr-deref in ip6gre_init_net()
  drivers/net/wan/x25_asy: Fix to make it work
  dev: Defer free of skbs in flush_backlog
  AX.25: Prevent out-of-bounds read in ax25_sendmsg()
  AX.25: Fix out-of-bounds read in ax25_connect()
  Revert "Revert "ANDROID: ALSA: jack: Update supported jack switch types""
  Revert "Revert "ANDROID: ASoC: compress: fix unsigned integer overflow check""
  ANDROID: GKI: enable CONFIG_VIDEO_V4L2_SUBDEV_API
  FROMLIST: power: add "Wireless" to power_supply_type and power_supply_type_text
  Revert "ANDROID: ASoC: compress: fix unsigned integer overflow check"
  Revert "ANDROID: ALSA: jack: Update supported jack switch types"
  BACKPORT: FROMLIST: cpuidle: change enter_s2idle() prototype

Change-Id: I0dfd8e6b5e2a26997f144e542498f18f5f89408a
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

parents d8534164 b1f8486a

Makefile

+1 −1

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

android/abi_gki_aarch64.xml

+1279 −1235

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_261a54f37d.xml→android/abi_gki_aarch64_53b501f197.xml

+1549 −1488

File changed and moved.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_sunxi

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -39,20 +39,6 @@
	iommu_group_alloc		iommu_group_alloc
	iommu_group_register_notifier		iommu_group_register_notifier

	# required by uas.ko
	int_to_scsilun
	scmd_printk
	scsi_block_requests
	scsi_change_queue_depth
	scsi_print_command
	scsi_unblock_requests
	usb_alloc_streams
	usb_free_streams
	usb_kill_anchored_urbs
	usb_unanchor_urb
	usb_wait_anchor_empty_timeout
	usb_set_interface

	# required by ums-realtek.ko		# required by ums-realtek.ko
	usb_bulk_msg		usb_bulk_msg

arch/arm/mach-tegra/cpuidle-tegra114.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,11 +51,13 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev,
	return index;		return index;
	}		}

	static void tegra114_idle_enter_s2idle(struct cpuidle_device *dev,		static int tegra114_idle_enter_s2idle(struct cpuidle_device *dev,
	struct cpuidle_driver *drv,		struct cpuidle_driver *drv,
	int index)		int index)
	{		{
	tegra114_idle_power_down(dev, drv, index);		tegra114_idle_power_down(dev, drv, index);

			return 0;
	}		}
	#endif		#endif