jianzhou
edd77692fc
Merge android-4.9.209(c830063) into msm-4.9 ...
* refs/heads/tmp-c830063:
Linux 4.9.209
USB: serial: option: add Telit ME910G1 0x110a composition
USB: core: fix check for duplicate endpoints
vlan: fix memory leak in vlan_dev_set_egress_priority
net: sch_prio: When ungrafting, replace with FIFO
vlan: vlan_changelink() should propagate errors
vxlan: fix tos value before xmit
tcp: fix "old stuff" D-SACK causing SACK to be treated as D-SACK
sctp: free cmd->obj.chunk for the unprocessed SCTP_CMD_REPLY
pkt_sched: fq: do not accept silly TCA_FQ_QUANTUM
net: usb: lan78xx: fix possible skb leak
net: stmmac: dwmac-sunxi: Allow all RGMII modes
macvlan: do not assume mac_header is set in macvlan_broadcast()
llc2: Fix return statement of llc_stat_ev_rx_null_dsap_xid_c (and _test_c)
parisc: Fix compiler warnings in debug_core.c
block: fix memleak when __blk_rq_map_user_iov() is failed
net: stmmac: RX buffer size must be 16 byte aligned
perf/x86/intel: Fix PT PMI handling
kconfig: don't crash on NULL expressions in expr_eq()
regulator: rn5t618: fix module aliases
ASoC: wm8962: fix lambda value
rfkill: Fix incorrect check to avoid NULL pointer dereference
net: usb: lan78xx: Fix error message format specifier
bnx2x: Fix logic to get total no. of PFs per engine
bnx2x: Do not handle requests from VFs after parity
powerpc: Ensure that swiotlb buffer is allocated from low memory
samples: bpf: Replace symbol compare of trace_event
ARM: dts: am437x-gp/epos-evm: fix panel compatible
spi: spi-cavium-thunderx: Add missing pci_release_regions()
netfilter: uapi: Avoid undefined left-shift in xt_sctp.h
ARM: vexpress: Set-up shared OPP table instead of individual for each CPU
efi/gop: Fix memory leak in __gop_query32/64()
efi/gop: Return EFI_SUCCESS if a usable GOP was found
efi/gop: Return EFI_NOT_FOUND if there are no usable GOPs
netfilter: ctnetlink: netns exit must wait for callbacks
locking/spinlock/debug: Fix various data races
pstore/ram: Write new dumps to start of recycled zones
locking/x86: Remove the unused atomic_inc_short() methd
xen/blkback: Avoid unmapping unmapped grant pages
s390/smp: fix physical to logical CPU map for SMT
net: add annotations on hh->hh_len lockless accesses
ath9k_htc: Discard undersized packets
ath9k_htc: Modify byte order for an error message
rxrpc: Fix possible NULL pointer access in ICMP handling
powerpc/pseries/hvconsole: Fix stack overread via udbg
drm/mst: Fix MST sideband up-reply failure handling
fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP
tty: serial: msm_serial: Fix lockup for sysrq and oops
media: usb: fix memory leak in af9005_identify_state
regulator: ab8500: Remove AB8505 USB regulator
media: flexcop-usb: ensure -EIO is returned on error condition
Bluetooth: Fix memory leak in hci_connect_le_scan
Bluetooth: delete a stray unlock
Bluetooth: btusb: fix PM leak in error case of setup
xfs: don't check for AG deadlock for realtime files in bunmapi
nfsd4: fix up replay_matches_cache()
PM / devfreq: Check NULL governor in available_governors_show
arm64: Revert support for execute-only user mappings
ftrace: Avoid potential division by zero in function profiler
ALSA: cs4236: fix error return comparison of an unsigned integer
tracing: Have the histogram compare functions convert to u64 first
gpiolib: fix up emulated open drain outputs
ata: ahci_brcm: Fix AHCI resources management
ata: ahci_brcm: Allow optional reset controller to be used
ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys()
compat_ioctl: block: handle Persistent Reservations
dmaengine: Fix access to uninitialized dma_slave_caps
locks: print unsigned ino in /proc/locks
memcg: account security cred as well to kmemcg
mm/zsmalloc.c: fix the migrated zspage statistics.
MIPS: Avoid VDSO ABI breakage due to global register variable
ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code
Revert "perf report: Add warning when libunwind not compiled in"
drm: limit to INT_MAX in create_blob ioctl
taskstats: fix data-race
xfs: fix mount failure crash on invalid iclog memory access
PM / hibernate: memory_bm_find_bit(): Tighten node optimisation
xen/balloon: fix ballooned page accounting without hotplug enabled
xen-blkback: prevent premature module unload
IB/mlx4: Follow mirror sequence of device add during device removal
s390/cpum_sf: Avoid SBD overflow condition in irq handler
s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits
md: raid1: check rdev before reference in raid1_sync_request func
usb: gadget: fix wrong endpoint desc
scsi: libsas: stop discovering if oob mode is disconnected
scsi: iscsi: qla4xxx: fix double free in probe
scsi: qla2xxx: Don't call qlt_async_event twice
scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func
RDMA/cma: add missed unregister_pernet_subsys in init failure
PM / devfreq: Don't fail devfreq_dev_release if not in list
arm64: alternatives: use tpidr_el2 on VHE hosts
Conflicts:
drivers/gpu/drm/drm_property.c
kernel/locking/spinlock_debug.c
Change-Id: I0fef352511229dfc083a28b1b97f26dcd74d6e8d
Signed-off-by: jianzhou <jianzhou@codeaurora.org>
2020-03-13 15:47:19 +08:00
Merge android-4.9.163 ( 429c144) into msm-4.9
2019-04-26 13:08:21 +08:00
Migrate mpq demux driver from kernel 4.4 to 4.9
2017-06-28 15:45:59 +05:30
HSI: hsi_char.h: use __u32 from linux/types.h
2016-08-22 22:43:35 +02:00
isdn/capi: check message length in capi_write()
2019-09-21 07:14:01 +02:00
ASoC: wcd: add audio codec drivers for MSM targets
2017-01-27 11:28:43 -08:00
mmc: sdhci: Dont enable CDR for tuning commands
2017-04-07 17:29:55 -07:00
Merge android-4.9.209(c830063) into msm-4.9
2020-03-13 15:47:19 +08:00
Support full CONE NAT and ADDRESS RESTRICTED CONE NAT
2017-10-23 22:55:36 -07:00
NFC: Add snapshot of NQxxx NFC driver
2017-05-26 15:05:08 +05:30
spi: uapi: spidev: add missing ioctl header
2017-11-02 09:49:13 +01:00
uapi: export tc_skbmod.h
2016-12-05 19:43:02 -05:00
USB: Move MBIM interface related IOCTLs definition to uapi directory
2019-02-21 10:50:34 +05:30
Revert "include/uapi/linux/atm_zatm.h: include linux/time.h"
2016-11-13 12:35:13 -05:00
Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/audit
2016-10-04 14:21:41 -07:00
autofs4: move linux/auto_dev-ioctl.h to uapi/linux
2016-10-11 15:06:31 -07:00
autofs: move inclusion of linux/limits.h to uapi
2016-10-11 15:06:31 -07:00
batman-adv: add backbone table netlink support
2016-08-09 07:54:43 +02:00
power: vm-bms: Add snapshot of qpnp-vm-bms driver
2018-05-02 17:19:36 +05:30
bcache: Fix building error on MIPS
2017-12-05 11:24:34 +01:00
sdm429w: Add interface to load BG with TWM firmware
2020-02-07 12:25:56 +05:30
BACKPORT: bpf: multi program support for cgroup+bpf
2019-12-12 15:48:18 -08:00
bpf: introduce BPF_PROG_TYPE_PERF_EVENT program type
2016-09-02 10:46:44 -07:00
net: bpqether.h: remove if_ether.h guard
2016-11-13 00:57:53 -05:00
ipmi: add an Aspeed BT IPMI BMC driver
2016-09-29 19:05:06 -05:00
Btrfs: catch invalid free space trees
2016-10-03 18:52:14 +02:00
btrfs: Add sanity check for EXTENT_DATA when reading out leaf
2018-12-08 13:05:11 +01:00
can: raw: raw_setsockopt: limit number of can_filter that can be set
2016-12-07 10:45:57 +01:00
uapi: move forward declarations of internal structures
2016-08-02 17:31:41 -04:00
uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers
2019-08-06 18:29:38 +02:00
coresight: ost: Add OST support
2016-09-28 17:28:27 -07:00
powerpc updates for 4.8 #2
2016-08-05 09:00:54 -04:00
esoc: Add provision to handle shutdown request in userspace
2017-10-27 16:39:16 -07:00
ethtool: Remove trailing semicolon for static inline
2018-09-19 22:47:12 +02:00
eventpoll.h: fix epoll event masks
2018-03-22 09:17:38 +01:00
vfs: add a FALLOC_FL_UNSHARE mode to fallocate to unshare a range of blocks
2016-10-03 09:11:14 -07:00
f2fs/fscrypt: updates to v4.17-rc1
2018-04-12 09:54:41 -07:00
include: fib: Remove the deprecated UID fields
2017-09-06 15:09:16 -07:00
crypto: msm: Add QTI crypto drivers
2017-04-11 16:49:21 -07:00
Merge android-4.9.149 ( ed0b11d) into msm-4.9
2019-02-12 11:18:51 +08:00
Merge android-4.9.181 ( 6ccab84) into msm-4.9
2019-08-07 15:58:44 +08:00
input: misc: hbtp_input: support active blob flag
2018-02-28 14:42:44 -08:00
UPSTREAM: hw_breakpoint: Allow watchpoint of length 3,5,6 and 7
2017-03-13 15:31:05 -07:00
uapi glibc compat: fix outer guard of net device flags enum
2016-12-06 10:43:32 -05:00
msm_rmnet: merge support for RAWIP msm_rmnet device
2016-11-01 13:52:41 -06:00
net: bridge: export vlan flags with the stats
2016-08-18 23:18:42 -07:00
Merge android-4.9.160 ( fd5657a) into msm-4.9
2019-03-21 14:06:06 +08:00
BACKPORT: xfrm: Add virtual xfrm interfaces
2018-10-26 21:40:59 -07:00
include/uapi/linux/if_pppol2tp.h: include linux/in.h and linux/in6.h
2016-08-22 16:25:14 -07:00
ANDROID: net: move PPPoLAC and PPPoPNS headers to uapi
2017-01-19 13:32:06 -08:00
ANDROID: net: move PPPoLAC and PPPoPNS headers to uapi
2017-01-19 13:32:06 -08:00
ANDROID: net: add PPP on PPTP Network Server (PPPoPNS) driver.
2017-01-19 13:32:03 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-09-25 23:34:19 +02:00
tcp_bbr: add BBR congestion control
2016-09-21 00:23:01 -04:00
Merge android-4.9.152 ( fd37e28) into msm-4.9
2019-02-12 12:05:12 +08:00
UPSTREAM: HID: sony: Report DS4 motion sensors through a separate device
2018-10-24 17:03:59 -07:00
ion: add snapshot of ion support for MSM
2016-11-03 12:43:03 -07:00
netfilter: nf_defrag_ipv4: Add sysctl to disable per interface
2018-01-10 19:42:37 -07:00
msm: ipa: add support for HW stats to QMI
2018-05-04 16:09:13 +05:30
net/ipv6/addrconf: IPv6 tethering enhancement
2018-03-15 11:36:45 -07:00
net: ipv6: RTF_PCPU should not be settable from userspace
2017-05-03 08:36:36 -07:00
include/uapi/linux/ipx.h: fix conflicting defitions with glibc netipx/ipx.h
2016-08-22 16:25:15 -07:00
drivers misc: add okl4-link-shbuf driver
2018-12-09 18:41:17 -08:00
UPSTREAM: kcov: support comparison operands collection
2017-12-18 15:21:35 -08:00
KVM: x86: Add a framework for supporting MSR-based features
2018-08-15 18:14:52 +02:00
uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define
2019-02-20 10:18:35 +01:00
UPSTREAM: loop: add ioctl for changing logical block size
2018-10-16 16:23:19 +02:00
ANDROID: sdcardfs: Change magic value
2017-01-31 10:47:24 -08:00
uapi: Add display-related uapi headers for Android compilation
2017-03-23 13:55:19 -07:00
[media] media: Add 1X16 16-bit raw bayer media bus code definitions
2016-09-09 11:16:36 -03:00
[media] v4l2-core: Add support for touch devices
2016-08-23 16:28:04 -03:00
msm: mhi_dev: Add cv2x HW channel support in MHI driver
2019-07-30 05:53:20 -07:00
net: Add mask for Control register 10Mbps speed
2016-08-12 16:57:20 -07:00
uapi: fix linux/mroute6.h userspace compilation errors
2017-10-21 17:21:37 +02:00
drivers: soc: qcom: Snapshot of idle/sleep driver as of msm-4.4
2017-02-23 08:41:47 -07:00
uapi: Add missing header file msm_dsps.h.
2017-03-23 13:52:08 -07:00
ion: add snapshot of ion support for MSM
2016-11-03 12:43:03 -07:00
msm: ipa3: IPA clock vote ioctl
2019-12-27 08:57:27 -05:00
net: ipc_router: Add snapshot of IPC Router
2016-11-11 17:02:27 -08:00
msm: kgsl: Log context type in case of GPU faults
2018-10-15 16:06:11 +05:30
msm: mdss: Allow resource update during secure UI
2020-03-05 05:50:00 +05:30
msm: mdss: Add support to update backlight when display commit
2018-06-20 17:51:10 +05:30
net: rmnet_data: Add snapshot of rmnet_data driver
2016-11-01 20:02:26 -06:00
uapi: Add display-related uapi headers for Android compilation
2017-03-23 13:55:19 -07:00
include: Add snapshot of vidc encoder and decoder headers in msm-4.9
2018-05-22 20:34:11 -07:00
include: Add snapshot of vidc encoder and decoder headers in msm-4.9
2018-05-22 20:34:11 -07:00
libnvdimm: fix SMART Health DSM payload definition
2016-08-15 11:07:21 -07:00
net: rmnet_data: Add snapshot of rmnet_data driver
2016-11-01 20:02:26 -06:00
net: Add snapshot of sockev module
2017-03-29 16:54:34 -07:00
nfs: add a new NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK constant
2016-09-26 15:20:37 -04:00
nilfs2: move ioctl interface and disk layout to uapi separately
2016-08-02 19:35:21 -04:00
nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
2019-07-21 09:06:04 +02:00
cfg80211/nl80211: Offload OWE processing to user space in AP mode
2019-11-28 16:40:50 +08:00
nsfs: add ioctl to get a parent namespace
2016-09-22 19:59:41 -05:00
drivers misc: add okl4-link-shbuf driver
2018-12-09 18:41:17 -08:00
openvswitch: 802.1ad uapi changes.
2016-09-08 17:10:27 -07:00
uapi: fix linux/packet_diag.h userspace compilation error
2017-03-22 12:43:34 +01:00
Merge android-4.9.93 ( 05baf14) into msm-4.9
2018-05-11 03:06:00 -07:00
net: cls_bpf: limit hardware offload by software-only flag
2016-09-21 19:50:02 -04:00
net_sched: Add flow control support to prio qdisc
2017-03-22 17:37:14 -06:00
posix_acl: uapi header split
2016-09-27 21:52:00 -04:00
posix_acl: uapi header split
2016-09-27 21:52:00 -04:00
Merge android-4.9.176 ( e0625b3) into msm-4.9
2019-06-13 14:31:04 +08:00
arm/arm64: KVM: Add PSCI_VERSION helper
2018-04-20 08:21:04 +02:00
qbt1000: Add support for fingerprint gestures
2018-02-14 20:40:01 +05:30
msm: crypto: Add support for map and unmap ioctls
2018-04-20 10:56:50 -07:00
uapi: Add missing Secure System uapi header files for sdm845
2017-03-13 18:08:32 -07:00
power: qpnp-qg: Add support for PMI632 v2.0
2018-06-18 11:37:25 +05:30
power: qpnp-qg: Add support for voltage-only mode of QG
2019-01-17 17:27:28 +05:30
uapi: Add missing Secure System uapi header files for sdm845
2017-03-13 18:08:32 -07:00
ice: msm: Encrypt only userdata
2018-06-01 14:39:35 +05:30
random: add new ioctl RNDRESEEDCRNG
2018-04-24 09:34:16 +02:00
uapi: fix linux/rds.h userspace compilation errors
2017-11-21 09:23:28 +01:00
rapidio: add RapidIO channelized messaging driver
2016-08-02 19:35:31 -04:00
net: rmnet_data: Add support to configure custom device name
2017-03-22 12:26:21 -06:00
msm: ipa: Add support for per client lan statistics
2017-10-30 23:23:51 +05:30
UPSTREAM: net: core: add UID to flows, rules, and routes
2017-01-27 13:55:58 -08:00
BACKPORT: clone: add CLONE_PIDFD
2019-09-03 13:44:48 -07:00
sctp: Export struct sctp_info to userspace
2016-08-08 12:51:58 -07:00
seccomp: Add filter flag to opt-out of SSB mitigation
2018-05-22 16:58:01 +02:00
seemp: read hypervisor rooting detections
2017-07-12 10:12:23 -07:00
seemp: read hypervisor rooting detections
2017-07-12 10:12:23 -07:00
serial: Add UART port for EUD
2016-09-01 16:17:11 -07:00
serial: 8250: Set Altera 16550 TX FIFO Threshold
2016-09-27 12:55:50 +02:00
uapi: Add missing Secure System uapi header files for sdm845
2017-03-13 18:08:32 -07:00
tcp: tcp_fragment() should apply sane memory limits
2019-06-17 19:53:32 +02:00
net: Add snapshot of sockev module
2017-03-29 16:54:34 -07:00
spcom: move SPCOM_MAX_CHANNELS define to uapi/linux/spcom.h
2017-08-13 08:35:44 -07:00
dma-buf/sync_file: fix documentation error
2016-09-20 18:12:38 +05:30
netfilter: nf_defrag_ipv4: Add sysctl to disable per interface
2018-01-10 19:42:37 -07:00
BACKPORT: delayacct: track delays from thrashing cache pages
2019-03-22 14:08:39 -07:00
BACKPORT: net/tcp-fastopen: Add new API support
2017-11-13 15:18:49 +08:00
BACKPORT: tee: add register user memory
2018-02-21 15:40:42 +00:00
Revert "rtc: alarm: Add power-on alarm feature"
2017-11-01 01:19:42 -07:00
tipc: Avoid copying bytes beyond the supplied data
2019-06-11 12:22:34 +02:00
tipc: add the ability to get UDP options via netlink
2016-08-26 21:38:41 -07:00
msm: vidc: Add support for setting dynamic QP range
2019-05-19 14:09:11 +05:30
[media] SDI: add flag for SDI formats and SMPTE 125M definition
2016-09-19 14:34:41 -03:00
vhost: new device IOTLB API
2016-08-02 16:53:54 +03:00
v4l2-compat-ioctl32: Add support for private buffers
2019-11-19 12:56:57 +05:30
virtio: new feature to detect IOMMU device quirk
2016-08-01 21:44:52 +03:00
VSOCK: Introduce virtio_vsock_common.ko
2016-08-02 02:57:29 +03:00
virtio-vsock: fix include guard typo
2016-08-09 13:42:38 +03:00
power: vm-bms: Add snapshot of qpnp-vm-bms driver
2018-05-02 17:19:36 +05:30
BACKPORT: xfrm: Add a new lookup key to match xfrm interfaces.
2018-10-26 21:39:51 -07:00
edd77692fc