* refs/heads/tmp-34e9e65:
Linux 4.19.28
bpf: fix sanitation rewrite in case of non-pointers
scsi: core: reset host byte in DID_NEXUS_FAILURE case
exec: Fix mem leak in kernel_read_file
Bluetooth: Fix locking in bt_accept_enqueue() for BH context
Bluetooth: btrtl: Restore old logic to assume firmware is already loaded
selftests: firmware: fix verify_reqs() return value
USB: serial: cp210x: fix GPIO in autosuspend
gnss: sirf: fix premature wakeup interrupt enable
xtensa: fix get_wchan
aio: Fix locking in aio_poll()
MIPS: irq: Allocate accurate order pages for irq stack
applicom: Fix potential Spectre v1 vulnerabilities
usb: xhci: Fix for Enabling USB ROLE SWITCH QUIRK on INTEL_SUNRISEPOINT_LP_XHCI
tracing: Fix event filters and triggers to handle negative numbers
x86/boot/compressed/64: Do not read legacy ROM on EFI system
x86/CPU/AMD: Set the CPB bit unconditionally on F17h
net: sched: act_tunnel_key: fix NULL pointer dereference during init
net/sched: act_skbedit: fix refcount leak when replace fails
net/sched: act_ipt: fix refcount leak when replace fails
net: dsa: mv88e6xxx: prevent interrupt storm caused by mv88e6390x_port_set_cmode
net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X
ipv4: Pass original device to ip_rcv_finish_core
mpls: Return error for RTA_GATEWAY attribute
ipv6: Return error for RTA_VIA attribute
ipv4: Return error for RTA_VIA attribute
net: avoid use IPCB in cipso_v4_error
net: Add __icmp_send helper.
tun: remove unnecessary memory barrier
xen-netback: fix occasional leak of grant ref mappings under memory pressure
xen-netback: don't populate the hash cache on XenBus disconnect
tun: fix blocking read
tipc: fix race condition causing hung sendto
net: socket: set sock->sk to NULL after calling proto_ops::release()
net: sit: fix memory leak in sit_init_net()
net: phy: phylink: fix uninitialized variable in phylink_get_mac_state
net: phy: Micrel KSZ8061: link failure after cable connect
net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails
net: netem: fix skb length BUG_ON in __skb_to_sgvec
netlabel: fix out-of-bounds memory accesses
net: dsa: mv88e6xxx: Fix u64 statistics
net: dsa: mv88e6xxx: Fix statistics on mv88e6161
lan743x: Fix TX Stall Issue
ipv4: Add ICMPv6 support when parse route ipproto
hv_netvsc: Fix IP header checksum for coalesced packets
geneve: correctly handle ipv6.disable module parameter
bnxt_en: Drop oversize TX packets to prevent errors.
tipc: fix RDM/DGRAM connect() regression
team: Free BPF filter when unregistering netdev
sky2: Disable MSI on Dell Inspiron 1545 and Gateway P-79
sctp: call iov_iter_revert() after sending ABORT
qmi_wwan: Add support for Quectel EG12/EM12
net-sysfs: Fix mem leak in netdev_register_kobject
net: sched: put back q.qlen into a single location
net: dsa: mv8e6xxx: fix number of internal PHYs for 88E6x90 family
net: dsa: mv88e6xxx: handle unknown duplex modes gracefully in mv88e6xxx_port_set_duplex
ip6mr: Do not call __IP6_INC_STATS() from preemptible context
staging: android: ashmem: Avoid range_alloc() allocation with ashmem_mutex held.
staging: android: ashmem: Don't call fallocate() with ashmem_mutex held.
staging: android: ion: fix sys heap pool's gfp_flags
staging: wilc1000: fix to set correct value for 'vif_num'
staging: comedi: ni_660x: fix missing break in switch statement
staging: erofs: compressed_pages should not be accessed again after freed
staging: erofs: fix illegal address access under memory pressure
USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485
USB: serial: cp210x: add ID for Ingenico 3070
USB: serial: option: add Telit ME910 ECM composition
staging: erofs: fix mis-acted TAIL merging behavior
cpufreq: Use struct kobj_attribute instead of struct global_attr
ANDROID: cuttlefish: enable CONFIG_INET_UDP_DIAG=y
ANDROID: PM / EM: Document the support for legacy (deprecated) EM
UPSTREAM: sched/doc: Document Energy Aware Scheduling
UPSTREAM: PM/EM: Document the Energy Model framework
ANDROID: cuttlefish: enable CONFIG_USB_RTL8152=y
ANDROID: cuttlefish_defconfig: Add support for AC97 audio
ANDROID: cpufreq: times: optimize proc files
ANDROID: cpufreq: times: record fast switch frequency transitions
ANDROID: cpufreq: times: add /proc/uid_concurrent_{active,policy}_time
ANDROID: cuttlefish_defconfig: Enable CONFIG_CPU_FREQ_TIMES
ANDROID: cpufreq: Add time_in_state to /proc/uid directories
ANDROID: proc: Add /proc/uid directory
ANDROID: cpufreq: times: track per-uid time in state
ANDROID: cpufreq: track per-task time in state
ANDROID: cuttlefish: enable CONFIG_NETFILTER_XT_TARGET_CT=y
ANDROID: overlayfs: override_creds=off option bypass creator_cred
Conflicts:
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_times.c
drivers/staging/android/ion/ion_system_heap.c
fs/proc/Kconfig
include/linux/cpufreq_times.h
Change-Id: If347563ae5f040a43c74e1138d412738928dcc01
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
e0d3bea1a7