Commit graph android_kernel_sony_sdm845/include/uapi
Message SHA1
Merge "UPSTREAM: Merge PC57.5 commit '9d1406e' into msm-4.9 - 12/11/17"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-12-12 17:19:43 -08:00
1faac63ebe
msm: ipa4: add VLAN mode to rndis_ipa and ecm_ipa
IPA core driver will receive at boot information about which LAN
interfaces should support VLAN. rndis_ipa and ecm_ipa will query
that info and will register the correct header accordingly.

Change-Id: I9cf0875e94373e06aa6a4200d629e5934199a345
CRs-Fixed: 2156924
Signed-off-by: Amir Levy <alevy@codeaurora.org>

Amir Levy   commited 2017-12-12 10:09:46 +02:00
2da9d45e50
UPSTREAM: Merge PC57.5 commit '9d1406e' into msm-4.9 - 12/11/17
* commit '9d1406e':
  msm: camera: Add support for active deactive feature
  msm: camera: sensor: Remove unrelevant power down sequence
  msm: camera: Change Log level for cci irq
  msm: camera: icp: Fix calculation of acquire size
  msm: camera: isp: Lock around every list access
  msm: camera: sync: Validate state of sync object in sync signal
  msm: camera: reqmgr: Adds total ordering of reqs for all pd devices
  msm: camera: icp: Add Power Collapse
  msm: camera: Apply power settings from userspace
  msm: camera: util: Remove logk from read and write
  msm: camera: icp: Populate the right size for pkts sent by FW
  msm: camera: crm: Use del_timer_sync to delete the timer
  msm: camera: Call secure camera during stream on
  msm: camera: Add external cfg command opcode and csiphy cfg
  ARM: dts: msm: ICP clock failure fix for sdm670
  msm: camera: isp: resolve csid stop race condition
  msm: camera: crm: Add mutex lock to avoid race condition
  ARM: dts: msm: update camera node for sdm670 qrd devices
  msm: camera: isp: Cleanup the hw manager Context variables during release
  msm: camera: Fix incorrect update in EEPROM packet parser
  msm: camera: cpas: Configure Qos settings
  ARM: dts: msm: Add shared gpio for front/iris camera on SDM845
  msm: camera: reqmgr: Add reserved field to align UAPI

Change-Id: If275550a7025cd029fa2bb118d769e56aa532326
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>

Abhijit Trivedi   commited 2017-12-11 17:15:21 -08:00
351bd89e3c
Merge "msm: camera: reqmgr: Add reserved field to align UAPI" into dev/msm-4.9-camx
Jeyaprakash Soundrapandian   authored and   Gerrit - the friendly Code Review server   commited 2017-12-06 10:28:02 -08:00
3bc965b59a
msm: camera: Add external cfg command opcode and csiphy cfg
Add new opcode for external (non-CSL) config command to KMD.
Also add usage of external config command opcode so that csiphy
can directly use the ioctl command.

Change-Id: Ibbaffe074fda27916d62a828be8b62efd423c978
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>

Rajakumar Govindaram   authored and   Gerrit - the friendly Code Review server   commited 2017-12-04 14:13:48 -08:00
a29b70e53a
Merge "drm/msm/dp: fix usbpd and drm framework sequence"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-12-02 10:42:44 -08:00
fba4f1f354
UPSTREAM: Merge commit '8da65d4c3e' into mainline (11/30 PC42_44_47_48)
* commit '8da65d4c3e':
  Revert "msm: camera: icp: Add Power Collapse"
  msm: camera: icp: Add states to icp ctx
  msm: camera: reqmgr: Changes to support request alignment
  msm: camera: req_mgr: Populate sync mode info in request manager
  msm: camera: Add QUP i2c burst and sequential write support
  ARM: dts: msm: Add LRME hardware device node and its properties for sdm670
  msm: camera: correct the power down setting for AF
  msm: camera: req_mgr: Add sync mode flag in req_mgr uapi header
  msm: camera: sync: delete cb from list before queue work
  msm: camera: isp: Remove update of framedrop and IRQ subsampling
  msm: camera: sync: Check for duplicate register first
  msm: camera: Add support C-phy mode of CSIPHY
  msm: camera: Add clk support for ois and eeprom
  msm: camera: cpas: Allow 0 votes in update ahb, axi apis
  msm: camera: isp: Update the AXI vote at stop
  msm: camera: sync: Remove unnecessary alloc-free
  msm: camera: icp: Fix in message handle crash
  msm: camera: Configure the shared pinctrl properly
  msm: cam: reqmgr: Add Link control for camera request manager
  msm: camera: lrme: increment open count correctly
  msm: camera: isp: Handle more than one isp init packet
  msm: camera: isp: Improve the CSID resource allocation logic
  msm: camera: isp: Protect flush from spinlock recursion
  ARM: dts: msm: Enable front camera flash for SDM670 CDP/MTP
  Revert "msm: camera: Handling Buffer Error notified by reg_mgr"
  msm: camera: icp: Add Power Collapse
  msm: camera: jpeg: Add stop device in jpeg context
  ARM: dts: msm: Add iris camera flash support for sdm845

Change-Id: I87a03aca042024c02509194acbffaa1e9340e06a
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>

Abhijit Trivedi   commited 2017-11-30 15:44:27 -08:00
3a945deb11
Merge "Merge remote-tracking branch '4.9/tmp-8cca21f' into 4.9"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-29 19:30:07 -08:00
7513ba4cc3
Merge "usb: gadget: uvc: Add support for UVC 1.5"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-29 19:29:20 -08:00
4f24664695
Merge "msm: sde: add P010 Venus support for rotator"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-29 19:29:09 -08:00
112f709828
Merge remote-tracking branch '4.9/tmp-8cca21f' into 4.9
* 4.9/tmp-8cca21f:
  Linux 4.9.65
  mm/pagewalk.c: report holes in hugetlb ranges
  coda: fix 'kernel memory exposure attempt' in fsync
  mm/page_alloc.c: broken deferred calculation
  ipmi: fix unsigned long underflow
  ocfs2: should wait dio before inode lock in ocfs2_setattr()
  ocfs2: fix cluster hang after a node dies
  dmaengine: dmatest: warn user when dma test times out
  serial: 8250_fintek: Fix finding base_port with activated SuperIO
  serial: omap: Fix EFR write on RTS deassertion
  ima: do not update security.ima if appraisal status is not INTEGRITY_PASS
  crypto: dh - Fix double free of ctx->p
  crypto: dh - fix memleak in setkey
  net/sctp: Always set scope_id in sctp_inet6_skb_msgname
  fealnx: Fix building error on MIPS
  sctp: do not peel off an assoc from one netns to another one
  af_netlink: ensure that NLMSG_DONE never fails in dumps
  vlan: fix a use-after-free in vlan_device_event()
  net: usb: asix: fill null-ptr-deref in asix_suspend
  qmi_wwan: Add missing skb_reset_mac_header-call
  net: qmi_wwan: fix divide by 0 on bad descriptors
  net: cdc_ether: fix divide by 0 on bad descriptors
  bonding: discard lowest hash bit for 802.3ad layer3+4
  netfilter/ipvs: clear ipvs_property flag when SKB net namespace changed
  tcp: do not mangle skb->cb[] in tcp_make_synack()
  net: vrf: correct FRA_L3MDEV encode type
  tcp_nv: fix division by zero in tcpnv_acked()
  Linux 4.9.64
  staging: greybus: spilib: fix use-after-free after deregistration
  brcmfmac: don't preset all channels as disabled
  x86/MCE/AMD: Always give panic severity for UC errors in kernel context
  USB: serial: garmin_gps: fix memory leak on probe errors
  USB: serial: garmin_gps: fix I/O after failed probe and remove
  USB: serial: qcserial: add pid/vid for Sierra Wireless EM7355 fw update
  usb: gadget: f_fs: Fix use-after-free in ffs_free_inst
  USB: Add delay-init quirk for Corsair K70 LUX keyboards
  USB: usbfs: compute urb->actual_length for isochronous
  crypto: dh - Don't permit 'key' or 'g' size longer than 'p'
  crypto: dh - Don't permit 'p' to be 0
  Revert "dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification"
  Revert "dt-bindings: Add vendor prefix for LEGO"
  uapi: fix linux/rds.h userspace compilation errors
  uapi: fix linux/rds.h userspace compilation error
  Revert "uapi: fix linux/rds.h userspace compilation errors"
  Revert "crypto: xts - Add ECB dependency"
  MIPS: Netlogic: Exclude netlogic,xlp-pic code from XLR builds
  MIPS: traps: Ensure L1 & L2 ECC checking match for CM3 systems
  MIPS: init: Ensure reserved memory regions are not added to bootmem
  MIPS: init: Ensure bootmem does not corrupt reserved memory
  MIPS: End asm function prologue macros with .insn
  staging: greybus: add host device function pointer checks
  staging: wilc1000: Fix endian sparse warning
  staging: rtl8712: fixed little endian problem
  ixgbe: do not disable FEC from the driver
  ixgbe: add mask for 64 RSS queues
  ixgbe: Reduce I2C retry count on X550 devices
  ixgbe: Fix reporting of 100Mb capability
  ixgbe: handle close/suspend race with netif_device_detach/present
  ixgbe: fix AER error handling
  ixgbe: Configure advertised speeds correctly for KR/KX backplane
  arm64: dts: NS2: reserve memory for Nitro firmware
  ALSA: hda/realtek - Add new codec ID ALC299
  gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
  backlight: adp5520: Fix error handling in adp5520_bl_probe()
  backlight: lcd: Fix race condition during register
  drm/omap: panel-sony-acx565akm.c: Add MODULE_ALIAS
  ALSA: vx: Fix possible transfer overflow
  ALSA: vx: Don't try to update capture stream before running
  power: supply: axp288_fuel_gauge: Read 12 bit values 2 registers at a time
  power: supply: axp288_fuel_gauge: Read 15 bit values 2 registers at a time
  rtc: rx8010: change lock mechanism
  scsi: lpfc: Clear the VendorVersion in the PLOGI/PLOGI ACC payload
  scsi: lpfc: Correct issue leading to oops during link reset
  scsi: lpfc: Correct host name in symbolic_name field
  scsi: lpfc: FCoE VPort enable-disable does not bring up the VPort
  scsi: lpfc: Add missing memory barrier
  x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
  staging: rtl8188eu: fix incorrect ERROR tags from logs
  tcp: provide timestamps for partial writes
  scsi: ufs: add capability to keep auto bkops always enabled
  scsi: ufs-qcom: Fix module autoload
  igb: Fix hw_dbg logging in igb_update_flash_i210
  igb: close/suspend race in netif_device_detach
  igb: reset the PHY before reading the PHY ID
  drm/sti: sti_vtg: Handle return NULL error from devm_ioremap_nocache
  ata: SATA_MV should depend on HAS_DMA
  ata: SATA_HIGHBANK should depend on HAS_DMA
  ata: ATA_BMDMA should depend on HAS_DMA
  ARM: dts: omap5-uevm: Allow bootloader to configure USB Ethernet MAC
  ARM: dts: Fix omap3 off mode pull defines
  ARM: OMAP2+: Fix init for multiple quirks for the same SoC
  ARM: dts: Fix am335x and dm814x scm syscon to probe children
  ARM: dts: Fix compatible for ti81xx uarts for 8250
  fm10k: request reset when mbx->state changes
  extcon: palmas: Check the parent instance to prevent the NULL
  extcon: Remove potential problem when calling extcon_register_notifier()
  Bluetooth: btusb: fix QCA Rome suspend/resume
  arm: crypto: reduce priority of bit-sliced AES cipher
  media: dib0700: fix invalid dvb_detach argument
  media: imon: Fix null-ptr-deref in imon_probe
  Linux 4.9.63
  misc: panel: properly restore atomic counter on error path
  qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT (v2)
  target/iscsi: Fix iSCSI task reassignment handling
  brcmfmac: remove setting IBSS mode when stopping AP
  security/keys: add CONFIG_KEYS_COMPAT to Kconfig
  netfilter: nat: Revert "netfilter: nat: convert nat bysrc hash to rhashtable"
  netfilter: nat: avoid use of nf_conn_nat extension
  Revert "ARM: dts: imx53-qsb-common: fix FEC pinmux config"
  ALSA: seq: Cancel pending autoload work at unbinding device
  Input: ims-psu - check if CDC union descriptor is sane
  usb: usbtest: fix NULL pointer dereference
  mac80211: don't compare TKIP TX MIC key in reinstall prevention
  mac80211: use constant time comparison with keys
  mac80211: accept key reinstall without changing anything
  ppp: fix race in ppp device destruction
  net_sched: avoid matching qdisc with zero handle
  sctp: reset owner sk for data chunks on out queues when migrating a sock
  tun: allow positive return values on dev_get_valid_name() call
  ip6_gre: update dst pmtu if dev mtu has been updated by toobig in __gre6_xmit
  ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
  ipip: only increase err_count for some certain type icmp in ipip_err
  tap: double-free in error path in tap_open()
  net/unix: don't show information about sockets from other namespaces
  tcp/dccp: fix other lockdep splats accessing ireq_opt
  tcp/dccp: fix lockdep splat in inet_csk_route_req()
  sctp: full support for ipv6 ip_nonlocal_bind & IP_FREEBIND
  ipv6: flowlabel: do not leave opt->tot_len with garbage
  soreuseport: fix initialization race
  packet: avoid panic in packet_getsockopt()
  tcp/dccp: fix ireq->opt races
  sctp: add the missing sock_owned_by_user check in sctp_icmp_redirect
  tun: call dev_get_valid_name() before register_netdevice()
  l2tp: check ps->sock before running pppol2tp_session_ioctl()
  tcp: fix tcp_mtu_probe() vs highest_sack
  net: call cgroup_sk_alloc() earlier in sk_clone_lock()
  netlink: do not set cb_running if dump's start() errs
  ipv6: addrconf: increment ifp refcount before ipv6_del_addr()
  tun/tap: sanitize TUNSETSNDBUF input
  gso: fix payload length when gso_size is zero
  FROMLIST: binder: fix proc->files use-after-free

Conflicts:
	drivers/scsi/ufs/ufshcd.h
	include/net/netfilter/nf_conntrack.h

Change-Id: I38fd3aa5f077a7bde0a8de4ebe9dc9316075f199
Signed-off-by: Kyle Yan <kyan@codeaurora.org>

Kyle Yan   commited 2017-11-29 13:12:37 -08:00
01bff91034
Merge "msm: vidc: add new Venus P010 V4L2 color format definition"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-28 15:06:36 -08:00
813c9a3c35
drm/msm: add HDR EOTF values
Define HDR (High Dynamic Range) EOTF (Electro-Optical Transfer Function)
standard values that can be used by user modules.

Change-Id: I34b75630df8c668e37bdf3e23fa78b35f1d18560
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>

Ajay Singh Parmar   commited 2017-11-27 16:59:30 -08:00
4c4c21682b
msm: camera: req_mgr: Add sync mode flag in req_mgr uapi header
To support dual camera and to handle requests in
sync or non-sync mode, sync_mode flag is required
while scheduling requests. Add macro definitions
for different sync modes and flag in uapi structure.

Change-Id: I69a26e2fdf34959f6440d2330c6acd9d2d1d6a8c
Signed-off-by: Pavan Kumar Chilamkurthi <pchilamk@codeaurora.org>

Pavan Kumar Chilamkurthi   authored and   Karthik Anantha Ram   commited 2017-11-27 15:57:12 -08:00
547dd8f6eb
Merge "msm: cam: reqmgr: Add Link control for camera request manager" into dev/msm-4.9-camx
Jeyaprakash Soundrapandian   authored and   Gerrit - the friendly Code Review server   commited 2017-11-27 12:59:43 -08:00
e5c3525114
msm: sde: add P010 Venus support for rotator
Add P010 Venus support for v4l2 offline rotator.
P010 Venus format has additional stride requirements
over P010 linear format.

Change-Id: Id1c786b56422447cf5a4633848a9fb35f02727b7
Signed-off-by: Alan Kwong <akwong@codeaurora.org>

Alan Kwong   commited 2017-11-22 22:51:09 -05:00
25e4686e57
msm: vidc: add new Venus P010 V4L2 color format definition
Add new V4L2 color format definition of linear 10bit
Venus P010 for better communication with display side.

Change-Id: I8eb6fe6342afb9ff3cd80129a99df50c24a9133f
Signed-off-by: Zhongbo Shi <zhongbos@codeaurora.org>

Zhongbo Shi   commited 2017-11-23 10:17:28 +08:00
dd3224b883
usb: gadget: uvc: Add support for UVC 1.5
Add UVC 1.5 specification support for the existing
peripheral UVC function driver.
Also add support for H264 format streaming.

Change-Id: I3efe7db77793990ce76af7dcc566f91daeb05436
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>

Sriharsha Allenki   commited 2017-11-22 16:27:42 +05:30
548380aa28
msm: cam: reqmgr: Add Link control for camera request manager
Add the link control command for the Camera Request Manager driver.
This change is required for the low power operation.

Change-Id: Iddd5da871c51de062bcfcbf6a4ec74f8b1fdd845
Signed-off-by: Jing Zhou <jzhou70@codeaurora.org>

Jing Zhou   authored and   Gerrit - the friendly Code Review server   commited 2017-11-21 14:01:23 -08:00
0f645330db
msm: kgsl: Add the flags for IO coherency
Add a flag in the UAPI header to allow userspace to mark a buffer
as IO coherent. If this flag is set, mark the buffer as IO
coherent when mapping it.

Change-Id: I4cd28144cf818fa016e085f6f5ec29b778ccd8ad
Signed-off-by: Shrenuj Bansal <shrenujb@codeaurora.org>
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>

Shrenuj Bansal   authored and   Lynus Vaz   commited 2017-11-21 18:21:25 +05:30
4fd6a5635c
This is the 4.9.64 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAloT4oIACgkQONu9yGCS
 aT4iexAAhh9dTauRApugfkmBlG/Svjw2XasMQouXkey8EzOavQ0zDwGfubqqTbnT
 hbiP5nh2yBvGbTo/Cj+GxsSCbrAa69/sOZDHCpNI1UpNbW4Xi5di7MwSIdYLuFGC
 KXCdNAo8hNOFjmVvyPE7usfsnhvD+JlUhlUvqJH8kPwj0pQiHF+sMfK6+yZsoYB8
 TOY17iB3rJYZ2gAZH++MDfLdw4kO8gN5WqmAX2+YdQOc6RjcqCVnfoWSpX4WYZen
 g0cOAR6WsmDhAlWuK4zEja6FL2MZhAl93yxUoApUOjwTG7fjw8H+y4QrsyfM3GDN
 bYL3xMLXsfJ8Ws0PMpp22YvWYYMVbK8Xnh049cOprcI1a0fZFn7USpqAUwPS4L/G
 RU6gkuS1aubXXm2q/TIHj9Eo0M3ZueQtsjBWlbnn01q+SgaThoHdeqYUTHCuFqOi
 RGgLWDyrV1JgkxuN6V/rboOaOCFSUIVXly0o0HGCp7r8Nus7KjUUfSevfi6Kh2DG
 fLacHh58NtNiPMUNVME7K29gwQb1aOoLMRYDgd5EiwiQMTZ2lanIv8TXIjzl3SKB
 mQFnyYYqNYdBkwwM6s7bUrsWJx3+T7Pu+XHDlr1GYmg+sjcK91rh/DeixcBer7TF
 r2hVgkGTWpPabUjjfKkF4P00c90BLfmYnozsh919YIeLMU/2OGM=
 =bpAs
 -----END PGP SIGNATURE-----

Merge 4.9.64 into android-4.9-o

Changes in 4.9.64
	media: imon: Fix null-ptr-deref in imon_probe
	media: dib0700: fix invalid dvb_detach argument
	arm: crypto: reduce priority of bit-sliced AES cipher
	Bluetooth: btusb: fix QCA Rome suspend/resume
	extcon: Remove potential problem when calling extcon_register_notifier()
	extcon: palmas: Check the parent instance to prevent the NULL
	fm10k: request reset when mbx->state changes
	ARM: dts: Fix compatible for ti81xx uarts for 8250
	ARM: dts: Fix am335x and dm814x scm syscon to probe children
	ARM: OMAP2+: Fix init for multiple quirks for the same SoC
	ARM: dts: Fix omap3 off mode pull defines
	ARM: dts: omap5-uevm: Allow bootloader to configure USB Ethernet MAC
	ata: ATA_BMDMA should depend on HAS_DMA
	ata: SATA_HIGHBANK should depend on HAS_DMA
	ata: SATA_MV should depend on HAS_DMA
	drm/sti: sti_vtg: Handle return NULL error from devm_ioremap_nocache
	igb: reset the PHY before reading the PHY ID
	igb: close/suspend race in netif_device_detach
	igb: Fix hw_dbg logging in igb_update_flash_i210
	scsi: ufs-qcom: Fix module autoload
	scsi: ufs: add capability to keep auto bkops always enabled
	tcp: provide timestamps for partial writes
	staging: rtl8188eu: fix incorrect ERROR tags from logs
	x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
	scsi: lpfc: Add missing memory barrier
	scsi: lpfc: FCoE VPort enable-disable does not bring up the VPort
	scsi: lpfc: Correct host name in symbolic_name field
	scsi: lpfc: Correct issue leading to oops during link reset
	scsi: lpfc: Clear the VendorVersion in the PLOGI/PLOGI ACC payload
	rtc: rx8010: change lock mechanism
	power: supply: axp288_fuel_gauge: Read 15 bit values 2 registers at a time
	power: supply: axp288_fuel_gauge: Read 12 bit values 2 registers at a time
	ALSA: vx: Don't try to update capture stream before running
	ALSA: vx: Fix possible transfer overflow
	drm/omap: panel-sony-acx565akm.c: Add MODULE_ALIAS
	backlight: lcd: Fix race condition during register
	backlight: adp5520: Fix error handling in adp5520_bl_probe()
	gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
	ALSA: hda/realtek - Add new codec ID ALC299
	arm64: dts: NS2: reserve memory for Nitro firmware
	ixgbe: Configure advertised speeds correctly for KR/KX backplane
	ixgbe: fix AER error handling
	ixgbe: handle close/suspend race with netif_device_detach/present
	ixgbe: Fix reporting of 100Mb capability
	ixgbe: Reduce I2C retry count on X550 devices
	ixgbe: add mask for 64 RSS queues
	ixgbe: do not disable FEC from the driver
	staging: rtl8712: fixed little endian problem
	staging: wilc1000: Fix endian sparse warning
	staging: greybus: add host device function pointer checks
	MIPS: End asm function prologue macros with .insn
	MIPS: init: Ensure bootmem does not corrupt reserved memory
	MIPS: init: Ensure reserved memory regions are not added to bootmem
	MIPS: traps: Ensure L1 & L2 ECC checking match for CM3 systems
	MIPS: Netlogic: Exclude netlogic,xlp-pic code from XLR builds
	Revert "crypto: xts - Add ECB dependency"
	Revert "uapi: fix linux/rds.h userspace compilation errors"
	uapi: fix linux/rds.h userspace compilation error
	uapi: fix linux/rds.h userspace compilation errors
	Revert "dt-bindings: Add vendor prefix for LEGO"
	Revert "dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification"
	crypto: dh - Don't permit 'p' to be 0
	crypto: dh - Don't permit 'key' or 'g' size longer than 'p'
	USB: usbfs: compute urb->actual_length for isochronous
	USB: Add delay-init quirk for Corsair K70 LUX keyboards
	usb: gadget: f_fs: Fix use-after-free in ffs_free_inst
	USB: serial: qcserial: add pid/vid for Sierra Wireless EM7355 fw update
	USB: serial: garmin_gps: fix I/O after failed probe and remove
	USB: serial: garmin_gps: fix memory leak on probe errors
	x86/MCE/AMD: Always give panic severity for UC errors in kernel context
	brcmfmac: don't preset all channels as disabled
	staging: greybus: spilib: fix use-after-free after deregistration
	Linux 4.9.64

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Greg Kroah-Hartman   commited 2017-11-21 12:54:10 +01:00
1812c2456f
uapi: fix linux/rds.h userspace compilation errors
[ Upstream commit feb0869d90e51ce8b6fd8a46588465b1b5a26d09 ]

Consistently use types from linux/types.h to fix the following
linux/rds.h userspace compilation errors:

/usr/include/linux/rds.h:106:2: error: unknown type name 'uint8_t'
  uint8_t name[32];
/usr/include/linux/rds.h:107:2: error: unknown type name 'uint64_t'
  uint64_t value;
/usr/include/linux/rds.h:117:2: error: unknown type name 'uint64_t'
  uint64_t next_tx_seq;
/usr/include/linux/rds.h:118:2: error: unknown type name 'uint64_t'
  uint64_t next_rx_seq;
/usr/include/linux/rds.h:121:2: error: unknown type name 'uint8_t'
  uint8_t transport[TRANSNAMSIZ];  /* null term ascii */
/usr/include/linux/rds.h:122:2: error: unknown type name 'uint8_t'
  uint8_t flags;
/usr/include/linux/rds.h:129:2: error: unknown type name 'uint64_t'
  uint64_t seq;
/usr/include/linux/rds.h:130:2: error: unknown type name 'uint32_t'
  uint32_t len;
/usr/include/linux/rds.h:135:2: error: unknown type name 'uint8_t'
  uint8_t flags;
/usr/include/linux/rds.h:139:2: error: unknown type name 'uint32_t'
  uint32_t sndbuf;
/usr/include/linux/rds.h:144:2: error: unknown type name 'uint32_t'
  uint32_t rcvbuf;
/usr/include/linux/rds.h:145:2: error: unknown type name 'uint64_t'
  uint64_t inum;
/usr/include/linux/rds.h:153:2: error: unknown type name 'uint64_t'
  uint64_t       hdr_rem;
/usr/include/linux/rds.h:154:2: error: unknown type name 'uint64_t'
  uint64_t       data_rem;
/usr/include/linux/rds.h:155:2: error: unknown type name 'uint32_t'
  uint32_t       last_sent_nxt;
/usr/include/linux/rds.h:156:2: error: unknown type name 'uint32_t'
  uint32_t       last_expected_una;
/usr/include/linux/rds.h:157:2: error: unknown type name 'uint32_t'
  uint32_t       last_seen_una;
/usr/include/linux/rds.h:164:2: error: unknown type name 'uint8_t'
  uint8_t  src_gid[RDS_IB_GID_LEN];
/usr/include/linux/rds.h:165:2: error: unknown type name 'uint8_t'
  uint8_t  dst_gid[RDS_IB_GID_LEN];
/usr/include/linux/rds.h:167:2: error: unknown type name 'uint32_t'
  uint32_t max_send_wr;
/usr/include/linux/rds.h:168:2: error: unknown type name 'uint32_t'
  uint32_t max_recv_wr;
/usr/include/linux/rds.h:169:2: error: unknown type name 'uint32_t'
  uint32_t max_send_sge;
/usr/include/linux/rds.h:170:2: error: unknown type name 'uint32_t'
  uint32_t rdma_mr_max;
/usr/include/linux/rds.h:171:2: error: unknown type name 'uint32_t'
  uint32_t rdma_mr_size;
/usr/include/linux/rds.h:212:9: error: unknown type name 'uint64_t'
 typedef uint64_t rds_rdma_cookie_t;
/usr/include/linux/rds.h:215:2: error: unknown type name 'uint64_t'
  uint64_t addr;
/usr/include/linux/rds.h:216:2: error: unknown type name 'uint64_t'
  uint64_t bytes;
/usr/include/linux/rds.h:221:2: error: unknown type name 'uint64_t'
  uint64_t cookie_addr;
/usr/include/linux/rds.h:222:2: error: unknown type name 'uint64_t'
  uint64_t flags;
/usr/include/linux/rds.h:228:2: error: unknown type name 'uint64_t'
  uint64_t  cookie_addr;
/usr/include/linux/rds.h:229:2: error: unknown type name 'uint64_t'
  uint64_t  flags;
/usr/include/linux/rds.h:234:2: error: unknown type name 'uint64_t'
  uint64_t flags;
/usr/include/linux/rds.h:240:2: error: unknown type name 'uint64_t'
  uint64_t local_vec_addr;
/usr/include/linux/rds.h:241:2: error: unknown type name 'uint64_t'
  uint64_t nr_local;
/usr/include/linux/rds.h:242:2: error: unknown type name 'uint64_t'
  uint64_t flags;
/usr/include/linux/rds.h:243:2: error: unknown type name 'uint64_t'
  uint64_t user_token;
/usr/include/linux/rds.h:248:2: error: unknown type name 'uint64_t'
  uint64_t  local_addr;
/usr/include/linux/rds.h:249:2: error: unknown type name 'uint64_t'
  uint64_t  remote_addr;
/usr/include/linux/rds.h:252:4: error: unknown type name 'uint64_t'
    uint64_t compare;
/usr/include/linux/rds.h:253:4: error: unknown type name 'uint64_t'
    uint64_t swap;
/usr/include/linux/rds.h:256:4: error: unknown type name 'uint64_t'
    uint64_t add;
/usr/include/linux/rds.h:259:4: error: unknown type name 'uint64_t'
    uint64_t compare;
/usr/include/linux/rds.h:260:4: error: unknown type name 'uint64_t'
    uint64_t swap;
/usr/include/linux/rds.h:261:4: error: unknown type name 'uint64_t'
    uint64_t compare_mask;
/usr/include/linux/rds.h:262:4: error: unknown type name 'uint64_t'
    uint64_t swap_mask;
/usr/include/linux/rds.h:265:4: error: unknown type name 'uint64_t'
    uint64_t add;
/usr/include/linux/rds.h:266:4: error: unknown type name 'uint64_t'
    uint64_t nocarry_mask;
/usr/include/linux/rds.h:269:2: error: unknown type name 'uint64_t'
  uint64_t flags;
/usr/include/linux/rds.h:270:2: error: unknown type name 'uint64_t'
  uint64_t user_token;
/usr/include/linux/rds.h:274:2: error: unknown type name 'uint64_t'
  uint64_t user_token;
/usr/include/linux/rds.h:275:2: error: unknown type name 'int32_t'
  int32_t  status;

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Dmitry V. Levin   authored and   Greg Kroah-Hartman   commited 2017-11-21 09:23:28 +01:00
f95d6058d5
uapi: fix linux/rds.h userspace compilation error
[ Upstream commit 1786dbf3702e33ce3afd2d3dbe630bd04b1d2e58 ]

On the kernel side, sockaddr_storage is #define'd to
__kernel_sockaddr_storage.  Replacing struct sockaddr_storage with
struct __kernel_sockaddr_storage defined by <linux/socket.h> fixes
the following linux/rds.h userspace compilation error:

/usr/include/linux/rds.h:226:26: error: field 'dest_addr' has incomplete type
  struct sockaddr_storage dest_addr;

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Dmitry V. Levin   authored and   Greg Kroah-Hartman   commited 2017-11-21 09:23:28 +01:00
3323d07612
Revert "uapi: fix linux/rds.h userspace compilation errors"
This reverts commit ad50561ba7.

There was a mixup with the commit message for two upstream commit
that have the same subject line.

This revert will be followed by the two commits with proper commit
messages.

Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Sasha Levin   authored and   Greg Kroah-Hartman   commited 2017-11-21 09:23:28 +01:00
3f0cc54226
UPSTREAM: Merge commit '870305b' into msm-4.9 (PC30-PC35) 11/19
* commit '870305b' with revert of '0554525':
  ARM: dts: msm: Correct eeprom node in SDM670 Camera CDP/MTP dtsi
  msm: camera: sync:Cleanup sync object link properly
  msm: camera: Add shared clk support
  msm: camera: isp: Disable the rdi sof in none RDI only session
  msm: camera: core: remove extra stop during release
  msm: camera: icp: Make sure to set bitmap to NULL
  msm: camera: icp: Add write barrier in hfi command write
  ARM: dts: msm: Add missing turbo clk control level for sdm845
  msm: camera: fix OIS firmware crash issue
  msm: camera: crm: Clean up the handle struct on unlink
  msm: camera: crm: Send error notification for SOF freeze
  msm: camera: isp: Add changes for dynamic clock/BW update
  msm: camera: isp: Fixed dual ife stripe wm update

Change-Id: I4002570e42ed873014e598acfa5bc30ae490829f
Signed-off-by: Kevin Matlage <kmatlage@codeaurora.org>

Kevin Matlage   commited 2017-11-19 18:29:58 -08:00
817e4d88bd
DOWNSTREAM: Merge AU282 commit '6bf4cf1b10' into topic
* commit '6bf4cf1b10':
  ARM: dts: msm: Add bluetooth node of wcn3990 for sdm845
  ARM: dts: msm: add SD card detect pinctrl for SDM670 QRD platform
  ARM: dts: msm: Add sleep counter support for sdm670
  regulator: cpr4: fix compilation warning
  ARM: dts: msm: Add device tree node for emac driver on sdxpoorwills
  USB: dwc3: gadget: Fix TxFIFO resizing logic
  ARM: dts: msm: reserve memory for splash on sdm670
  regulator: rpmh-regulator: add support for XOB type regulator resources
  msm: kgsl: Use the common CX debug register access functions
  ARM: dts: msm: Ioremap the CX debug GPU block in SDM845
  msm: vidc: Fix type casting issue for 32bit build error
  hbtp_input : Add timeout for wait completion
  ARM: dts: msm: Increase dsp cma heap for concurrency on SDM845
  ARM: dts: msm: Enable sw-jeita for QRD670 device
  ARM: dts: msm: Enable sw-jeita for QVR845 device
  ARM: dts: msm: Add sw-jeita configuration for mlp446579 battery
  net: rmnet_data: Optimize the UL aggregation skip logic
  msm: kgsl: Fix for '__udivdi3' build error
  msm: kgsl: Use %zu for sizeof type
  msm: kgsl: Fix parameter undeclared error in trace_kgsl_mem_sync_full_cache
  dwc3-msm: Use pm_runtime_put_sync_suspend()
  ARM: dts: msm: Add sw-jeita configuration for mlp356477 battery
  msm: vidc: Convert csc custom matrix enable bool to hfi mask
  iommu: arm-smmu: Don't call iommu unmap with zero size
  arm64: dma-mapping: Correct variable type
  msm: kgsl: Ioremap the CX debug register block
  power: qpnp-fg-gen3: disable parallel charging during battery removal
  scsi: ufs: fix the UFS command tracing events
  drivers: qcom: lpm-stats: reset CPU stats from that CPU
  msm: kgsl: Read A6XX non-context registers directly
  msm: kgsl: Correctly derive DDR stall cycles from GBIF power counters
  arm: Kconfig: Add select GENERIC_IRQ_MIGRATION for HOTPLUG_CPU
  sched: Fix for 32bit '__udivdi3' build error
  drm/msm/sde: Fix for build error of sde_rsc_client_state_update
  defconfig: sdm670: Disable unwanted flags in sdm670
  ARM: dts: msm: disable kgsl smmu ATOS for sdm670
  kernel: time: Fix low resolution timer not fire in 32bit case
  ARM: dts: msm: Add display panel support for SDM670 QRD
  ARM: dts: msm: Add support for PRNG TPDM on SDM670
  ARM: dts: msm: add SWAO TGU support on sdm670
  regulator: cpr4-apss: Update APC CPR fuse combo logic for msm8953
  ARM: dts: update ufs slave bus voting IB for SDM845
  ARM: smp: Remove use of IPI_CALL_FUNC_SINGLE
  hbtp_input : Update the callback function
  msm: kgsl: Printk format fix for 32bit build error
  PM / wakeup: Fix error when CONFIG_QCOM_SHOW_RESUME_IRQ not defined
  net: rmnet_data: Skip UL aggregation for ping packets
  sched: remove duplicate entries from Makefile/Kconfig
  cpuidle: Wrap cpu_online_mask usage with preempt_disable
  soc: qcom: service-locator: Fix error message prints for receiving messages
  msm: kgsl: Use usleep_range for GMU synchronization
  usb: host: xhci: Add NULL check in xhci_find_slot_id_by_port API
  msm: vidc: Remove PQ extradata support
  Revert "msm_11ad: keep rf_clk3 on during wil6210 activity"
  dwc3-msm: Change USB SMMU related page table range
  dwc3: Use dma_alloc_coherent() API instead of DMA pool for GSI TRB ring
  wil6210: prevent parallel suspend and dump collection
  diag: Split data stream for User PDs on LPASS
  ARM: dts: msm: update low SVS mapping for L3 sdm670
  drm/msm/dsi-staging: add error handling support to DSI driver
  power: supply: qcom: Make JEITA/step charging setting dtsi configurable
  power: qpnp-fg-gen3: Set invalid negative value for batt_id_ohms
  ARM: dts: msm: Update L3 freq mapping at high end for sdm845 v2
  dwc3-msm: Use dwc->sysdev instead of dwc->dev with DMA APIs
  msm: Add CLD80211_ATTR_META_DATA vendor attribute
  slimbus: Sequentialize the device state notifications
  soc: qcom: pil: Poll on MSS_STATUS[Q6_AXI_TO_BMIC_ACCESS]
  soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait
  i2c: busses: i2c-qcom-geni: Fix error decoding logic
  ARM: dts: msm: enable ESD check for nt35597 truly panel on sdm845
  ARM: dts: msm: Allow compute gov to go to 1.8 GHZ on sdm845 v2
  ARM: dts: msm: Add DT support for new compute governor
  drm/msm/sde: enable continuous splash
  drm/msm/sde: add support to update DRM structures during bootup
  drm/msm/sde: handle RM when continuous splash is enabled
  drm/msm/sde: update Resource manager with specific resource IDs
  drm/msm/sde: handle smmu handoff for continuous splash
  drm/msm/sde: read MDSS registers for current configuration
  drm/msm/dsi-staging: dsi resource handling for continuous splash
  drm/msm: reorder component add to accommodate continuous splash
  mmc: core: Return error if fallback to lower speed mode fails
  drm/msm/sde: delay rsc pre-stop for video/wb encoders
  media: dvb-core: Fix possible array index access error
  ARM: dts: msm: Use same sid for apps iommu test devices for sdm670
  ARM: dts: msm: Add iommu coherent test device for SDM670
  msm: adsprpc: Handle NULL pointer dereference
  msm: ADSPRPC: Fix for null-ptr-dereference
  arm: highmem: Fix CPU_DYING callback for kmap
  ARM: dts: msm: Add camera node for sdm670 qrd devices
  ARM: dts: msm: fix the audio etm QMI instance ID of sdm670
  ARM: dts: msm: Rename SMMU translation property for qce on SDM670
  defconfig: msm: add tgu config for sdm670
  drm/msm/sde: avoid large memory chunk allocation on stack
  diag: Handle data ready notification properly
  sched: Fix for compile issue
  msm: ADSPRPC: make happy of compiler -Wmaybe-uninitialized
  msm: camera: util: Disable IRQ before clocks
  PM / devfreq: memlat: Add support for compute-bound logic
  ARM: dts: msm: Add cpu set for adsp glink on sdm845
  soc: qcom: glink: Add support to set affinities
  drivers: edac: Reinitialize errxctlr and overflow counter after PM_EXIT
  soc: qcom: pil: Increase Boot FSM timeout value
  wil6210: set platform features based on FW capabilities
  ARM: dts: msm: Add dump node for cpuss debug
  include: soc: Add enum for dumping cpuss debug registers
  msm: vidc: Enable caching for pagetable pages
  net: rmnet_data: Fix assignments, reads, and logic
  nl80211: fix null-ptr dereference on invalid mesh configuration
  usb: dwc3: Read snps,bus-suspend-enable property
  of_batterydata: Add properties for step-chg/sw-jeita settings
  drm/msm/sde: separate the power notify and idle notify events
  clk: qcom: Add support for 700MHz for GPU clock for sdm670
  ARM: dts: msm: Add device tree support for sdm450
  msm: ipa3: Fix to NULL pointer dereference
  ARM: dts: msm: Correct GPI dma-cells value for SDM670
  ARM: dts: msm: Add camera node for sdm845 qvr board
  ARM: dts: msm: Enable GPI DMA SMMU support for SDM670
  drm/msm/sde: add SMART_PANEL_ALIGN_MODE config for split display
  ARM: dts: msm: Update the energy model for SDM670
  soc: qcom: pil: Fix error handling during PIL driver probe
  msm: vidc: Add NULL check for vb buffers
  dwc3-msm: Replace autosuspend delay functionality with stop host mode
  msm: clk: qcom: add clock handoff for vco to support continuous splash
  msm: kgsl: Optimize WARN() API usage in gmu driver
  msm: clk: qcom: fix recalc rate callback for 10nm DSI PLL
  soc: qcom: glink_smem_native_xport: Add readback to write index
  msm: vidc: Update input extradata buffer requirement
  ARM: dts: msm: add NULL packet insertion entry on SDM845, SDM670
  msm: kgsl: Do not expose kernel pointer for global entries
  drm/msm/dsi-staging: add support for dsi null packet insertion
  net: core: To send ARP probe when neighbor state is NUD_STALE
  ARM: dts: msm: Add touch panel support for SDM670 QRD
  ARM: dts: msm: remove non essential clocks with kgsl iommu for sdm670
  cpuidle: Wakeup only cpus for which qos has changed.
  qos: Pass the list of cpus with affected qos to notifer
  idrm/msm/sde: move lut cfg to crtc state
  msm: vidc: Don't assume session error as sys error
  defconfig: Enable ARCH_SDM450 support
  msm: Add initial support for sdm450 Kconfig platform
  socinfo: Add socinfo support for sdm450
  socinfo: Add socinfo support for msm8953
  BACKPORT: net: xfrm: support setting an output mark.
  msm: kgsl: Update GMU hang processing in adreno_stop
  drm/msm/sde: handle VSYNC_IN_EN during crtc power events
  ARM: dts: msm: Add refgen_north_bg_reg_addr value on SDM845
  usb: phy: Update BIAS_CTRL2 register based on REFGEN status
  usb: phy: Add BIAS_CTRL2 register offset as mandatory
  drm/msm/sde: avoid multi-display update during secure-session
  msm: kgsl: Update expected GMU FW version
  iommu: arm-smmu: Use remote_spin_lock_irqsave() variant
  ion: ion_cma_heap: Add no-map detection
  iommu: dma-mapping-fast: Add standard ftrace events
  iommu: Expand ftrace events
  iommu: Remove trace-events include from iommu.h
  iommu: Move report_iommu_fault() to iommu.c
  iommu: Include device.h in iommu.h
  treewide: Fix iommu.h include assumptions
  ARM: dts: msm: Add audio support for sda670
  ARM: dts: msm: update route map for sdm670 internal codec
  Linux 4.9.60
  ecryptfs: fix dereference of NULL user_key_payload
  regulator: fan53555: fix I2C device ids
  ipsec: Fix aborted xfrm policy dump crash
  cfg80211: fix connect/disconnect edge cases
  can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
  can: kvaser_usb: Correct return value in printout
  can: sun4i: fix loopback mode
  drm/powerplay: fix uninitialized variable
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
  assoc_array: Fix a buggy node-splitting case
  Input: gtco - fix potential out-of-bound access
  Input: elan_i2c - add ELAN0611 to the ACPI table
  xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
  fuse: fix READDIRPLUS skipping an entry
  spi: bcm-qspi: Fix use after free in bcm_qspi_probe() in error path
  spi: uapi: spidev: add missing ioctl header
  KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM
  usb: xhci: Handle error condition in xhci_stop_device()
  ceph: unlock dangling spinlock in try_flush_caps()
  ALSA: hda - fix headset mic problem for machines with alc236
  ALSA: hda/realtek - Add support for ALC236/ALC3204
  workqueue: replace pool->manager_arb mutex with a flag
  ARM: dts: msm: Add audio device tree overlays for HDK845
  mmc: sdhci-msm: flush mmc detect work asynchronously.
  ARM: dts: msm: Enable HS UART instance on QVR845
  pinctrl: qcom: Update Direct connect mapping for GPIO31/41/49/89
  drm/msm/dsi-staging: fix ESD check scheduling sequence
  msm: kgsl: Print Vulkan memory types as well
  USB: dwc3-msm: Protect enabling phy irqs with mutex
  drm/msm/dp: add HDR support to DisplayPort panel
  drivers: thermal: cpu_cooling: Allow core online during resume
  ARM: dts: msm: Add RPMH nodes for sdxpoorwills target
  soc: qcom: Fix compilation issues with power drivers
  drivers: mailbox: retry message submission
  ARM: dts: msm: switch 2k landscape sim panel to portrait mode on sdm845
  sched: Honor schedtune.prefer_idle flag
  net/embms-kernel : EMBMS Tunneling Module
  ARM: dts: msm: Add ICE node for SDM670
  diag: Remove AXI prefetch related padding
  drm/msm/dsi-staging: fix ESD check command transfer failure
  mmc: core: add mmc flush detect work.
  Revert "rtc: alarm: Add power-on alarm feature"
  Revert "rtc: alarm: Change wake-up source"
  drm/msm: pass the HDR metadata sent from userspace to sink
  drm/msm: add sink capabilities for HDR support
  ARM: dts: msm: remove configuration of DBU3 vsel gpio for sdm670
  defconfig: msm: Enable weight based blkio cgroup for sdm670
  drm/msm/dsi-staging: make cmd enable/disable functions atomic
  ARM: dts: msm: resolution switch support for sim cmd panel on sdm845
  ARM: dts: msm: Fix UART clock reference for sdxpoorwills
  regulator: qpnp-labibb: add TTW support for pmi8998
  ARM: dts: msm: Add initial sda845 v2.1 DT files
  drm/msm/sde: reject partial updates during modeset
  ARM: dts: msm: Add GSI DMA channels for I2C instances on sdm670
  ARM: dts: msm: update quinary mi2s dai id for sdm670
  diag: Flush mdlog table entries while reallocation of data buffer
  defconfig: arm: msm: Enable memshare config flag
  msm: kgsl: Correct GBIF perf counter registers config
  ARM: dts: msm: Add audio support for qcs605
  ARM: dts: msm: adjust LUT safe levels for sdm670
  ARM: dts: msm: Fix the wrongly configured CTIs on sdm670
  drm/msm/sde: print timeline status information for fence_timeout
  msm: vidc: Queue buffers based on client buffer type
  drivers: thermal: Skip cpu notifier registration for platform devices
  PM / devfreq: bw_hwmon: Delete "low power mode" feature
  msm: vidc: kill session without acquiring lock
  msm: vidc: Ensure firmware released all buffers in error case
  FROMLIST: android: binder: Fix null ptr dereference in debug msg
  FROMLIST: android: binder: Change binder_shrinker to static
  msm: ipa: Add support for UL Firewall
  msm: ipa: Add support for per client lan statistics
  msm: vidc: Set instance state to invalid upon error
  msm: ipa: Add support for per client statistics and UL firewall
  serial: msm_geni_serial: Remove remaining power votes at shutdown
  Netfilter: IRC: Copy nickname to proper address
  net: netfilter: IRC DCC for private clients
  ARM: dts: msm: update cd gpio of SD card for SDA845 V2 HDK
  msm: vidc: Add memory barrier after queue header update
  drm/msm/dp: invoke device tree parser on probe
  dwc3-msm: Flush sm_work with dwc3_restart_usb_host_mode() API
  serial: msm_geni_serial: Vote resources even if power framework is disabled
  defconfig: sdm670: Enable panic on EDAC correctable errors
  Linux 4.9.59
  FS-Cache: fix dereference of NULL user_key_payload
  KEYS: Fix race between updating and finding a negative key
  fscrypt: fix dereference of NULL user_key_payload
  xfs: trim writepage mapping to within eof
  xfs: cancel dirty pages on invalidation
  xfs: handle error if xfs_btree_get_bufs fails
  xfs: reinit btree pointer on attr tree inactivation walk
  xfs: don't change inode mode if ACL update fails
  xfs: move more RT specific code under CONFIG_XFS_RT
  xfs: Don't log uninitialised fields in inode structures
  xfs: handle racy AIO in xfs_reflink_end_cow
  xfs: always swap the cow forks when swapping extents
  xfs: Capture state of the right inode in xfs_iflush_done
  xfs: perag initialization should only touch m_ag_max_usable for AG 0
  xfs: update i_size after unwritten conversion in dio completion
  xfs: report zeroed or not correctly in xfs_zero_range()
  fs/xfs: Use %pS printk format for direct addresses
  xfs: evict CoW fork extents when performing finsert/fcollapse
  xfs: don't unconditionally clear the reflink flag on zero-block files
  vmbus: fix missing signaling in hv_signal_on_read()
  pkcs7: Prevent NULL pointer dereference, since sinfo is not always set.
  KEYS: don't let add_key() update an uninstantiated key
  lib/digsig: fix dereference of NULL user_key_payload
  KEYS: encrypted: fix dereference of NULL user_key_payload
  x86/microcode/intel: Disable late loading on model 79
  rtlwifi: rtl8821ae: Fix connection lost problem
  clockevents/drivers/cs5535: Improve resilience to spurious interrupts
  bus: mbus: fix window size calculation for 4GB windows
  brcmsmac: make some local variables 'static const' to reduce stack size
  brcmfmac: Add check for short event packets
  i2c: piix4: Fix SMBus port selection for Family 17h chips
  i2c: ismt: Separate I2C block read from SMBus block read
  ALSA: hda: Abort capability probe at invalid register read
  ALSA: hda: Remove superfluous '-' added by printk conversion
  ALSA: seq: Enable 'use' locking in all configurations
  drm/nouveau/mmu: flush tlbs before deleting page tables
  drm/nouveau/bsp/g92: disable by default
  can: esd_usb2: Fix can_dlc value for received RTR, frames
  xhci: Identify USB 3.1 capable hosts by their port protocol capability
  usb: musb: Check for host-mode using is_host_active() on reset interrupt
  usb: musb: sunxi: Explicitly release USB PHY on exit
  iio: dummy: events: Add missing break
  parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels
  can: gs_usb: fix busy loop if no more TX context is available
  ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital
  usb: hub: Allow reset retry for USB2 devices on connect bounce
  usb: quirks: add quirk for WORLDE MINI MIDI keyboard
  usb: cdc_acm: Add quirk for Elatec TWN3
  USB: serial: metro-usb: add MS7820 device id
  USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor()
  USB: devio: Revert "USB: devio: Don't corrupt user memory"
  ARM: dts: msm: enable DisplayPort for SDM845 QRD
  drm/msm/dsi-staging: enable DSI command DMA scheduling
  ARM: dts: msm: ADD memshare for sdm845-v2
  msm: kgsl: Optimize HW CGC settings
  defconfig: sdm670: Enable request based  device mapper
  diag: Update the read buffers status properly
  drm/msm/sde: Change error code type when crtc is not attached
  of_batterydata: add snapshot of DT bindings documentation for batterydata
  msm: kgsl: Prevent repeated FENCE stuck errors
  usb: pd: avoid out-of-bounds access when reading PDOs
  ARM: dts: msm: change qseecom region from cma to carveout on sdm670
  qcom-cpufreq: Remove superfluous NULL check for policy->freq_table
  qcom-cpufreq: Cache the resolved frequency index
  qcom-cpufreq: Implement resolve_freq method
  ARM: dts: msm: Add GPU power level speed bins for SDM670
  msm: kgsl: Add efuse read capabilities for A615 GPU
  Revert "msm: kgsl: Disable IFPC on Adreno A630"
  msm: kgsl: Update the dispatcher timer properly
  ARM: dts: msm: set qcom,guard-memory property for rmtfs on sdm670
  regulator: mem-acc: Add range check based override fuse version map
  msm: kgsl: Move SET_MARKER to after CACHE_FLUSH_TS
  defconfig: msm: Enable thermal drivers
  wil6210: add platform capabilities bitmap
  ASoC: handle mutex correctly to avoid possible deadlock
  drm/msm/dsi-staging: fix bad pointer dereference in dsi_ctrl_get
  iommu: arm-smmu: Add smmu init latency measurement
  msm: kgsl: Return supported page size based on available memory pools
  softirq: defer softirq processing to ksoftirqd if CPU is busy with RT

Change-Id: I9a074e7d8cc7c29ef40a2c31db14e42831312c07
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>

Abhijit Trivedi   commited 2017-11-17 14:02:30 -08:00
ef825aa3a9
msm: camera: reqmgr: Add reserved field to align UAPI
Add 32bit reserved field to align the UAPI structures
and avoid any mismatches.

Change-Id: I18117c503731e9d9cb7be756d15bca2021c50036
Signed-off-by: Harsh Shah <harshs@codeaurora.org>

Harsh Shah   authored and   Gerrit - the friendly Code Review server   commited 2017-11-15 15:32:34 -08:00
36a23e3d8d
Merge "msm: camera: crm: Send error notification for SOF freeze" into dev/msm-4.9-camx
Jeyaprakash Soundrapandian   authored and   Gerrit - the friendly Code Review server   commited 2017-11-14 23:39:34 -08:00
60b01cab93
Merge "msm: camera: isp: Add changes for dynamic clock/BW update" into dev/msm-4.9-camx
Jeyaprakash Soundrapandian   authored and   Gerrit - the friendly Code Review server   commited 2017-11-14 23:39:20 -08:00
37746f3d86
UPSTREAM: Merge commit '88a33ae' into msm-4.9_UPSTREAM - 11/14 - PC029
* commit '88a33ae':
  ARM: dts: msm: Add dtsi entry for LRME hardware for sdm845
  msm: camera: lrme: Add lrme driver implementation
  msm: camera: cpas: Enhance camnoc irq handling
  msm: camera: isp: Add support for overflow handling
  msm: camera: Fix some shared gpio issues
  msm: camera: icp: Change function return value only to report err
  msm: camera: sensor: Change the sequence to register request to CRM
  msm: camera: isp: Unlink in activated state
  msm: camera: isp: Stop IRQ if error IRQ is fired
  msm: camera: isp: Camif Raw dump config update
  msm: camera: isp: Enable request notification for IFE before streamon
  ARM: msm: camera: Add multi-type support for i2c data

Change-Id: Iac3430bf9603685921522f0c82099b383d8c84bd
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>

Abhijit Trivedi   commited 2017-11-14 19:00:10 -08:00
8fc0ddc85f
msm: camera: isp: Add changes for dynamic clock/BW update
Add framework to parse the clock and BW update Meta config and
update the VFE HW using that.

Change-Id: I96276a125e8ff1e26b1856a5059e5109da2b3f16
Signed-off-by: Harsh Shah <harshs@codeaurora.org>
Signed-off-by: David Dai <daidavid1@codeaurora.org>
Signed-off-by: Rajesh Sastrula <vrajesh@codeaurora.org>

Harsh Shah   authored and   David Dai   commited 2017-11-14 07:11:13 -08:00
291023914c
msm: camera: crm: Send error notification for SOF freeze
Notify the UMD when SOF freeze occurs, so that it can clean up
the session.

Change-Id: I72aaa2bbef9a55b3f90cd7cb30c846cc2a24cd0e
Signed-off-by: Harsh Shah <harshs@codeaurora.org>

Harsh Shah   authored and   Gerrit - the friendly Code Review server   commited 2017-11-13 18:24:31 -08:00
67fa231333
msm: camera: lrme: Add lrme driver implementation
Add camera Low Resolution Motion Estimation driver implementation
to enable LRME hw functionality. LRME HW block analyzes TAR and REF
frames to get motion estimation.

Change-Id: I2e5ac866430c087a956fa72f11e74bda4adc1bfa
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>

Junzhe Zou   commited 2017-11-13 15:30:55 -08:00
cc79a57ee7
UPSTREAM: PC27_PC28: Merge commit '2312efe856' into msm-4.9 - mainline -11/13
* commit '2312efe856':
  msm: camera: fd: Protect unbalanced stop and deinit
  msm: camera: icp: Deinit A5 before irq reset
  msm: camera: Enhance shared gpio support
  msm: camera: reqmgr: Fix mutex unlock issue
  msm: camera: isp: Clean the ISP Blob Cmd processing
  msm: camera: sync: protect sync obj creation from race condition
  msm: camera: isp: Rate limit error log
  msm: camera: isp: Subscribe to bus error irq
  msm: camera: isp: Add P010 format support in IFE
  ARM: dts: msm: Add camera shared resource support for sdm670/sdm845
  msm: camera: Add shared gpio and flash support

Change-Id: I116e5cf59cf463ed481c5508b5628dbfe77fd494
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>

Abhijit Trivedi   commited 2017-11-13 10:13:46 -08:00
de12ffbc1f
DOWNSTREAM: Merge AU267 commit '336e98a252' into topic
* commit '336e98a252':
  i2c: busses: i2c-qcom-geni: Add support for auto-suspend
  Revert "ARM: dts: msm: Add EUD device register address space with SDM845"
  esoc: Code cleanup for mdm9x45
  cfq: Give a chance to arm slice idle timer in case of group_idle
  drivers: media : demux : Fix demux test case failures
  defconfig: msm: Enable devmem support for sdm670
  dwc3: Remove unnecessary phy shutdown callbacks
  iommu: arm-smmu: Rename domain attribute
  power: qpnp-fg-gen3: Fine tune the monotonic SOC calculation
  icnss: Do not assert if reboot requested during PDR
  ARM: dts: msm: enable hold_soc_while_full feature for pm660 charger/FG
  ARM: dts: msm: enable hold_soc_while_full feature for pmi8998 charger/FG
  Revert "defconfig: arm64: Disable DEVMEM and DEVKMEM for sdm845"
  msm: ipa3: Remove redundant definitions from IPA driver
  msm: kgsl: Avoid ref counting in adreno_perfcounter_save()
  netfilter: nf_conntrack_sip: Register SIP ALG  sysctl table into procfs.
  netfilter: nf_conntrack_sip: Dynamically enable/disable SIP direct media.
  netfilter: nf_conntrack_sip: Dynamically enable/disable SIP ALG.
  ARM: dts: msm: Add SD card support for SDM670 QRD platform
  ARM: dts: msm: Add eMMC support for SDM670 QRD platform
  ARM: dts: msm: add mdss power domain support to sdm670
  mmc: sdhci-msm: Invalidate pin drive type data if it's not present
  esoc: Fix uninitialized count compilation error
  esoc: Fix irq unbalance wake disable warning
  esoc: Add provision to handle shutdown request in userspace
  esoc: Update SSR driver with crash status
  esoc: Add support for autoboot
  msm: ipa: avoid printing UL data stall
  net: rmnet_data: Fix comments on code review
  replace incorrect strscpy use in FORTIFY_SOURCE
  Revert "replace incorrect strscpy use in FORTIFY_SOURCE"
  net: core: To send ARP probe when neighbor state is NUD_STALE
  soc: sdm670: Update SCT table as per new SW/HW config
  thermal: tsens: Enable debug logging for tsens driver
  rtc: Disable alarm irq if alarm time is in the past
  defconfig: sdm670: Add support for BT uhid drivers
  ARM: dts: msm: update devfreq node frequency mapping in sdm670
  qbt1000: Fix for incorrect buffer size check and integer overflow
  qbt1000: Terminate fingerprint TA name with null
  defconfig: msm: Enable CONFIG_DEBUG_PREEMPT on SDM845
  qbt1000: Initialize drvdata structure before usage
  drm/msm/dp: fix DP configuration programming
  ARM: dts: msm: Fix glink interrupt for sdxpoorwills
  drm/msm/sde: prepare only affected encoder for commit
  msm: vidc: Set dpb color format in split buffer mode
  usb: dwc3: gadget: properly increment dequeue pointer on ep_dequeue
  drm/msm/sde: trigger async inline rotation before frame done
  drm/msm/sde: add hardware reset during kickoff errors
  drm/msm/sde: handle irq disable case for pp timeout
  ARM: dts: msm: Enable avb 2.0 verity for vendor partition for sdm670
  drm/msm/sde: track mode information in connector state
  msm: vidc: handle hw error before core release
  battery: handle early/late suspend/resume of i2c bus
  ARM: dts: msm: specify sde cpu latency qos for sdm845
  drm/msm/sde: request affine cores mask from pm_qos
  defconfig: msm: Disable devmem, devport support for sdm670
  ARM: dts: msm: fix the wrongly configured tpdm on sdm670
  drm/msm: add notification for bridge enable/disable
  msm: ipa4: add IPv6CT support
  ARM: dts: msm: Update the energy model for SDM670
  ARM: dts: msm: Add NFC device node for SDM670
  ARM: dts: msm: Enable EUD support for sdm670
  ARM: dts: msm: Reenable IOMMU TLB invalidate by ASID for sdm845
  ARM: dts: msm: update the energy model for SDM845v2
  msm: vidc: Increase response and power collapse timeout values
  msm: vidc: Skip validating buffer counts in close
  drm/msm: remove 5us wait from mode-2 sequence
  icnss: Restrict MSA0 permission to HLOS only during SSR
  drm/msm/sde: add plane support for halt and rotate reset
  msm: sde: add inline rotation abort command
  drm/msm/sde: add xin halt api for vbif
  drm/msm/sde: propagate kickoff prepare errors to crtc
  ARM: dts: msm: enable SSC feature for DSI clocks on sdm845
  drm/msm: set partial update preference per mode
  msm_rng: remove the check if zero is read from register
  ARM: dts: msm: enable ulps for 2.5k dsc cmd panel on sdm845
  defconfig: msm: Enable voltage ADC on sdxpoorwills
  hwmon: qpnp-adc: use div64_s64 instead of do_div
  ARM: dts: msm: Update VADC property on PM660/PM8998
  ARM: dts: msm: Configure PMIC GPIO2 pin on sdxpoorwills
  ARM: dts: msm: Add ADC nodes for sdxpoorwills
  hwmon: qpnp-adc: Add pinctrl property
  clockevents: Update clockevents device next_event
  msm: ipa: API changes
  msm: ipa3: add an API to unlock PCIe memory regions
  drm/msm/sde: mitigate error log in IRQ handler
  ARM: dts: msm: Change eMMC slave id for sdm670 bus voting
  hung task: check specific tasks for long uninterruptible sleep state
  ARM: dts: msm: Add flag for SMMU S1 support for SDM670
  sched/rt: Prevent leaking kernel address
  sched/rt: Improve RT throttling debugging
  ARM: dts: msm: Disable kgsl iommu test device for sdm670
  ARM: dts: msm: add SPMI PMIC arbiter device for msm8953
  ARM: dts: msm: Update thermal property for adc_tm channels on SDM670
  drm/msm: reduce ib sleep vote to 400MBps
  ARM: dts: msm: Rectify GPIO functionality for SDM670 console usecase
  msm: vidc: Fix video performance issues
  core_ctl: Implement not_preferred hint strictly
  ARM: dts: msm: Add iommu actlr settings for sdm845
  ARM: dts: msm: Add default DCC configuration for SDM845
  soc: qcom: Add init time configuration support to DCC
  soc: qcom: Insert poison value into DCC SRAM
  power: fg-memif: fix an OOB access while getting number of partitions
  esoc: Add err_fatal signal status to clink_ops
  esoc: Fix integration with SSR driver
  esoc: remove reduntant return_esoc_udev() fn call
  defconfig: sdm845: Enable task stats config
  Revert "usb: phy: Pet EUD based on LDO24 status"
  Revert "usb: phy: Clear the eud pet during probe"
  soc: qcom: eud: pet hw when ldo24 is turned on or off
  soc: qcom: msm-core: Remove the energy-aware driver
  ARM: dts: msm: add display preference for SDM670 SDE HW blocks
  msm: vidc: Enable non fatal fault for Venus CB
  msm: ipa3: Add support to configure dynamic MHI event ring IDs
  net: rps: reset backlog state when IPI fails.
  net: rmnet_data: validate csum in SW
  soc: qcom: glink_loopback_server: Add request intent flag for tx
  soc: qcom: Fix the programming of DCC registers for CRC,DCCV2
  ARM: dts: msm: Correct mixer offsets for sdm670
  power: qpnp-fg: Fix possible race condition in FG debugfs
  ARM: dts: msm: Enable QoS settings programming for sdm670
  msm: kgsl: Update HW CGC settings
  msm: kgsl: Change SP HW CGC settings
  Revert "msm: kgsl: Update CGC settings for preemption"
  drm: msm: fix list corruption problem
  msm: vidc: Add sanity check for resolutions
  ARM: dts: msm: Add thermal zone config for sdxpoorwills
  mmc: core: Prevent accessing user space buffer directly
  mmc: block: Unhalt the command queue before releasing mmc host
  USB: f_audio_source: Remove pm_qos request under non atomic context
  ALSA: usb-audio: Add length check after string desc copy
  Linux 4.9.58
  usb: dwc3: gadget: Correct ISOC DATA PIDs for short packets
  cpufreq: CPPC: add ACPI_PROCESSOR dependency
  EDAC, mce_: Print IPID and Syndrome on a separate line
  btmrvl: avoid double-disable_irq() race
  regulator: core: Resolve supplies before disabling unused regulators
  drm/nouveau/gr/gf100-: fix ccache error logging
  powerpc/perf: Add restrictions to PMC5 in power9 DD1
  nfsd/callback: Cleanup callback cred on shutdown
  hrtimer: Catch invalid clockids again
  target/iscsi: Fix unsolicited data seq_end_offset calculation
  IB/hfi1: Allocate context data on memory node
  IB/hfi1: Use static CTLE with Preset 6 for integrated HFIs
  uapi: fix linux/mroute6.h userspace compilation errors
  uapi: fix linux/rds.h userspace compilation errors
  ceph: clean up unsafe d_parent accesses in build_dentry_path
  ceph: fix bogus endianness change in ceph_ioctl_set_layout
  ceph: don't update_dentry_lease unless we actually got one
  i2c: at91: ensure state is restored after suspending
  qed: Read queue state before releasing buffer
  qed: Reserve doorbell BAR space for present CPUs
  qede: Prevent index problems in loopback test
  net: mvpp2: release reference to txq_cpu[] entry after unmapping
  drm/gpu: refuse to reserve io mem for split VRAM buffers
  ASoC: mediatek: add I2C dependency for CS42XX8
  scsi: scsi_dh_emc: return success in clariion_std_inquiry()
  slub: do not merge cache if slub_debug contains a never-merge flag
  ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock
  mm/memory_hotplug: set magic number to page->freelist instead of page->lru.next
  crypto: xts - Add ECB dependency
  net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
  sparc64: Migrate hvcons irq to panicked cpu
  md/linear: shutup lockdep warnning
  f2fs: do not wait for writeback in write_begin
  Btrfs: send, fix failure to rename top level inode due to name collision
  sched/fair: Update rq clock before changing a task's CPU affinity
  f2fs: do SSR for data when there is enough free space
  iio: adc: xilinx: Fix error handling
  netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
  staging: vchiq_2835_arm: Make cache-line-size a required DT property
  net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
  mac80211: fix power saving clients handling in iwlwifi
  qed: Don't use attention PTT for configuring BW
  ALSA: hda: Add Geminilake HDMI codec ID
  mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length
  initramfs: finish fput() before accessing any binary from initramfs
  irqchip/crossbar: Fix incorrect type of local variables
  watchdog: kempld: fix gcc-4.3 build
  locking/lockdep: Add nest_lock integrity test
  xen-netback: Use GFP_ATOMIC to allocate hash
  Revert "bsg-lib: don't free job in bsg_prepare_job"
  MIPS: Fix minimum alignment requirement of IRQ stack
  Revert "drm/msm/sde: output black frame during resume operation"
  msm: sde: move rotator mapping to the upper 2GB address space
  ARM: dts: msm: add refgen regulator for DP controller for SDM670
  ARM: dts: msm: move sde_dp device to sde dtsi for sdm670
  ARM: dts: msm: correct sound card name for sdm670 skuw
  msm: vidc: Fix incorrect fbd count issue
  msm: vidc: HDR10 PQ SEI generation for HEVC encoder
  drm/msm/dp: fix controller and parser sub module cleanup
  hwmon: qpnp-adc: Update VADC property
  qseecom: support listener request from smcinvoke without reentrancy
  msm: sde: issue vbif xin halt after reset sde rotator
  drm/msm : add null check on framebuffer in cleanup
  Revert "wil6210: use INTX interrupt by default"
  wil6210: missing length check in wil_cfg80211_mgmt_tx
  wil6210: missing length check in wmi_set_ie
  wil6210: add block size checks during FW load
  wil6210: fix length check in __wmi_send
  msm: vidc: Enable rbr pending flag for readonly buffer
  drm/msm/sde: signal fences during frame_event_error for video mode
  drm/msm/sde: move dpu mapping to the upper 2GB address space
  drm/msm/sde: remove frame_done_timer logic from encoder
  Revert "msm: kgsl: Set the power up register list length to 0"
  ARM: dts: msm: Update clock frequency for SDM670 for video core
  Linux 4.9.57
  KVM: nVMX: update last_nonleaf_level when initializing nested EPT
  x86/alternatives: Fix alt_max_short macro to really be a max()
  USB: serial: console: fix use-after-free after failed setup
  USB: serial: qcserial:
  USB: serial: option: add support for LTE module
  USB: serial: cp210x: add support for ELV TFD500
  USB: serial: ftdi_sio: add id for Cypress WICED dev board
  bio_copy_user_iov(): don't ignore ->iov_offset
  more bio_map_user_iov() leak fixes
  fix unbalanced page refcounting in bio_map_user_iov
  direct-io: Prevent NULL pointer access in submit_page_section
  usb: gadget: composite: Fix use-after-free in usb_composite_overwrite_options
  usb: gadget: configfs: Fix memory leak of interface directory data
  drm/i915/bios: parse DDI ports also for CHV for HDMI DDC pin and DP AUX channel
  drm/i915: Read timings from the correct transcoder in
  drm/i915/edp: Get the Panel Power Off timestamp after panel is off
  ALSA: line6: Fix leftover URB at error-path during probe
  ALSA: line6: Fix missing initialization before error path
  ALSA: caiaq: Fix stray URB at probe error path
  ALSA: seq: Fix copy_from_user() call inside lock
  ALSA: seq: Fix use-after-free at creating a port
  ALSA: usb-audio: Kill stray URB at exiting
  fs/mpage.c: fix mpage_writepage() for pages with buffers
  device property: Track owner device of device property
  iommu/: Finish TLB flush in _iommu_unmap()
  pinctrl/: Fix build dependency on pinmux code
  usb: renesas_usbhs: Fix DMAC sequence for receiving zero-length packet
  KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit
  KVM: MMU: always terminate page walks at level 1
  crypto: shash - Fix zero-length shash ahash digest crash
  HID: usbhid: fix out-of-bounds bug
  dmaengine: ti-dma-crossbar: Fix possible race condition with dma_inuse
  dmaengine: edma: Align the memcpy acnt array size with the transfer
  MIPS: math-emu: Remove pr_err() calls from fpu_emu()
  USB: dummy-hcd: Fix deadlock caused by disconnect detection
  rcu: Allow for page faults in NMI handlers
  nl80211: Define policy for packet pattern attributes
  CIFS: Reconnect expired SMB sessions
  ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets
  drm/msm/dp: add support for custom dpcd
  drm/msm/dp: clean up EDID and audio functionality
  drm/msm/dp: add support for custom edid
  msm: kgsl: Remove context debugfs nodes early
  drm/mms/dsi-staging: update dsc parsing error code
  drm/msm/sde: Fix NOC error in vsync handler
  ARM: dts: msm: Add device for CDSP voting on L3
  drm/msm/dp: update mode validation
  drm/msm/sde: Update BL scale value in atomic commit
  qseecom: fix an app unloading issue when the app is blocked
  ARM: dts: msm: Add retention support for qsmmuv500 for sdm670
  ARM: dts: msm: Add audio device tree overlays for QVR845
  Linux 4.9.56
  Revert "socket, bpf: fix possible use after free"
  Linux 4.9.55
  KVM: x86: fix singlestepping over syscall
  f2fs: don't allow encrypted operations without keys
  ext4: don't allow encrypted operations without keys
  ext4: Don't clear SGID when inheriting ACLs
  ext4: fix data corruption for mmap writes
  vfs: deny copy_file_range() for non regular files
  sched/cpuset/pm: Fix cpuset vs. suspend-resume bugs
  mmc: core: add driver strength selection when selecting hs400es
  nvme-pci: Use PCI bus address for data/queues in CMB
  drm/i915/bios: ignore HDMI on port A
  brcmfmac: setup passive scan if requested by user-space
  brcmfmac: add length check in brcmf_cfg80211_escan_handler()
  scsi: sd: Do not override max_sectors_kb sysfs setting
  iwlwifi: add workaround to disable wide channels in 5GHz
  iwlwifi: mvm: use IWL_HCMD_NOCOPY for MCAST_FILTER_CMD
  netlink: fix nla_put_{u8,u16,u32} for KASAN
  rocker: fix rocker_tlv_put_* functions for KASAN
  HID: wacom: bits shifted too much for 9th and 10th buttons
  HID: wacom: Always increment hdev refcount within wacom_get_hdev_data
  HID: wacom: leds: Don't try to control the EKR's read-only LEDs
  HID: i2c-hid: allocate hid buffers for real worst case
  ftrace: Fix kmemleak in unregister_ftrace_graph
  stm class: Fix a use-after-free
  Drivers: hv: fcopy: restore correct transfer length
  driver core: platform: Don't read past the end of "driver_override" buffer
  percpu: make this_cpu_generic_read() atomic w.r.t. interrupts
  powerpc/tm: Fix illegal TM state in signal handler
  powerpc/64s: Use emergency stack for kernel TM Bad Thing program checks
  socket, bpf: fix possible use after free
  net: rtnetlink: fix info leak in RTM_GETSTATS call
  tipc: use only positive error codes in messages
  ip6_tunnel: update mtu properly for ARPHRD_ETHER tunnel device in tx path
  ip6_gre: ip6gre_tap device should keep dst
  netlink: do not proceed if dump's start() errs
  net: Set sk_prot_creator when cloning sockets to the right proto
  packet: only test po->has_vnet_hdr once in packet_snd
  packet: in packet_do_bind, test fanout with bind_lock held
  net: dsa: Fix network device registration order
  tun: bail out from tun_get_user() if the skb is empty
  l2tp: fix race condition in l2tp_tunnel_delete
  l2tp: Avoid schedule while atomic in exit_net
  vti: fix use after free in vti_tunnel_xmit/vti6_tnl_xmit
  net: qcom/emac: specify the correct size when mapping a DMA buffer
  net_sched: always reset qdisc backlog in qdisc_reset()
  isdn/i4l: fetch the ppp_write buffer in one shot
  bpf: one perf event close won't free bpf program attached by another perf event
  packet: hold bind lock when rebinding to fanout hook
  net: emac: Fix napi poll list corruption
  tcp: fastopen: fix on syn-data transmit failure
  net/sched: cls_matchall: fix crash when used with classful qdisc
  ip6_tunnel: do not allow loading ip6_tunnel if ipv6 is disabled in cmdline
  net: phy: Fix mask value write on gmii2rgmii converter speed register
  ip6_gre: skb_push ipv6hdr before packing the header in ip6gre_header
  udpv6: Fix the checksum computation when HW checksum does not apply
  tcp: fix data delivery rate
  bpf/verifier: reject BPF_ALU64|BPF_END
  tcp: update skb->skb_mstamp more carefully
  sctp: potential read out of bounds in sctp_ulpevent_type_enabled()
  net: sched: fix use-after-free in tcf_action_destroy and tcf_del_walker
  mlxsw: spectrum: Prevent mirred-related crash on removal
  ALSA: usx2y: Suppress kernel warning at page allocation failures
  Revert "ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members"
  ALSA: compress: Remove unused variable
  lsm: fix smack_inode_removexattr and xattr_getsecurity memleak
  lib/ratelimit.c: use deferred printk() version
  mm, oom_reaper: skip mm structs with mmu notifiers
  staging: vchiq_2835_arm: Fix NULL ptr dereference in free_pagelist
  uwb: ensure that endpoint is interrupt
  uwb: properly check kthread_run return value
  iio: adc: mcp320x: Fix oops on module unload
  iio: adc: mcp320x: Fix readout of negative voltages
  iio: ad7793: Fix the serial interface reset
  IIO: BME280: Updates to Humidity readings need ctrl_reg write!
  iio: core: Return error for failed read_reg
  staging: iio: ad7192: Fix - use the dedicated reset function avoiding dma from stack.
  iio: ad_sigma_delta: Implement a dedicated reset function
  iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of 'twl4030_madc_probe()'
  iio: adc: twl4030: Fix an error handling path in 'twl4030_madc_probe()'
  Revert "xhci: Limit USB2 port wake support for  Promontory hosts"
  xhci: set missing SuperSpeedPlus Link Protocol bit in roothub descriptor
  xhci: Fix sleeping with spin_lock_irq() held in ASmedia 1042A workaround
  xhci: fix finding correct bus_state structure for USB 3.1 hosts
  USB: fix out-of-bounds in usb_set_configuration
  usb: Increase quirk delay for USB devices
  USB: core: harden cdc_parse_cdc_header
  USB: uas: fix bug in handling of alternate settings
  USB: g_mass_storage: Fix deadlock when driver is unbound
  usb: gadget: mass_storage: set msg_registered after msg registered
  USB: devio: Don't corrupt user memory
  USB: dummy-hcd: Fix erroneous synchronization change
  USB: dummy-hcd: fix infinite-loop resubmission bug
  USB: dummy-hcd: fix connection failures (wrong speed)
  USB: cdc-wdm: ignore -EPIPE from GetEncapsulatedResponse
  usb: pci-quirks.c: Corrected timeout values used in handshake
  ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
  usb: renesas_usbhs: fix usbhsf_fifo_clear() for RX direction
  usb: renesas_usbhs: fix the BCLR setting condition for non-DCP pipe
  usb-storage: fix bogus hardware error messages for ATA pass-thru devices
  usb-storage: unusual_devs entry to fix write-access regression for Seagate external drives
  usb: gadget: udc: renesas_usb3: Fix return value of usb3_write_pipe()
  usb: gadget: udc: renesas_usb3: fix Pn_RAMMAP.Pn_MPKT value
  usb: gadget: udc: renesas_usb3: fix for no-data control transfer
  usb: gadget: udc: atmel: set vbus irqflags explicitly
  USB: gadgetfs: fix copy_to_user while holding spinlock
  USB: gadgetfs: Fix crash caused by inadequate synchronization
  drm/msm/dsi-staging: add support to batch commands and kickoff
  drm/msm/dsi-staging: fix bug handling dsi cmd done interrupt delays
  Linux 4.9.54
  s390/mm: make pmdp_invalidate() do invalidation only
  ttpci: address stringop overflow warning
  ALSA: au88x0: avoid theoretical uninitialized access
  ASoC: rt5660: remove double const
  ASoC: rt5659: drop double const
  ASoC: rt5514: fix gcc-7 warning
  ARM: remove duplicate 'const' annotations'
  IB/qib: fix false-postive maybe-uninitialized warning
  tools/power turbostat: bugfix: GFXMHz column not changing
  ARM: dts: BCM5301X: Fix memory start address
  libata: transport: Remove circular dependency at free time
  ASoC: wm_adsp: Return an error on write to a disabled volatile control
  xfs: remove kmem_zalloc_greedy
  i2c: meson: fix wrong variable usage in meson_i2c_put_data
  netfilter: nf_tables: set pktinfo->thoff at AH header if found
  md/raid10: submit bio directly to replacement disk
  rds: ib: add error handle
  mm/cgroup: avoid panic when init with low memory
  iommu/io-pgtable-arm: Check for leaf entry before dereferencing it
  x86/acpi: Restore the order of CPU IDs
  cpufreq: pstate: Update pid_params.sample_rate_ns in pid_param_set()
  ibmvnic: Free tx/rx scrq pointer array when releasing sub-crqs
  nfs: make nfs4_cb_sv_ops static
  parisc: perf: Fix potential NULL pointer dereference
  netfilter: nfnl_cthelper: fix incorrect helper->expect_class_max
  nvme-rdma: handle cpu unplug when re-establishing the controller
  MIPS: smp-cps: Fix retrieval of VPE mask on big endian CPUs
  exynos-gsc: Do not swap cb/cr for semi planar formats
  iommu/exynos: Block SYSMMU while invalidating FLPD cache
  MIPS: IRQ Stack: Unwind IRQ stack onto task stack
  netfilter: invoke synchronize_rcu after set the _hook_ to NULL
  drivers/rapidio/devices/tsi721.c: make module parameter variable name unique
  kasan: do not sanitize kexec purgatory
  hugetlbfs: initialize shared policy as part of inode allocation
  sata_via: Enable hotplug only on VT6421
  Btrfs: fix potential use-after-free for cloned bio
  Btrfs: fix segmentation fault when doing dio read
  bridge: netlink: register netdevice before executing changelink
  mmc: sdio: fix alignment issue in struct sdio_func
  qed: Fix possible system hang in the dcbnl-getdcbx() path.
  net: dsa: b53: Include IMP/CPU port in dumb forwarding mode
  udp: disable inner UDP checksum offloads in IPsec case
  usb: plusb: Add support for PL-27A1
  team: fix memory leaks
  net/packet: check length in getsockopt() called with PACKET_HDRLEN
  net: core: Prevent from dereferencing null pointer when releasing SKB
  lkdtm: Fix Oops when unloading the module
  mips: ath79: clock:- Unmap region obtained by of_iomap
  MIPS: Lantiq: Fix another request_mem_region() return code check
  HID: wacom: release the resources before leaving despite devm
  drm: mali-dp: Fix transposed horizontal/vertical flip
  drm: mali-dp: Fix destination size handling when rotating
  ASoC: dapm: fix some pointer error handling
  rtl8xxxu: Add additional USB IDs for rtl8192eu devices
  usb: chipidea: vbus event may exist before starting gadget
  iommu/arm-smmu: Set privileged attribute to 'default' instead of 'unprivileged'
  spi: pxa2xx: Add support for Gemini Lake
  ath10k: prevent sta pointer rcu violation
  audit: log 32-bit socketcalls
  ASoC: dapm: handle probe deferrals
  partitions/efi: Fix integer overflow in GPT size calculation
  sfc: get PIO buffer size from the NIC
  USB: serial: mos7840: fix control-message error handling
  USB: serial: mos7720: fix control-message error handling
  drm/kfd: fix improper return value on error
  arm: dts: mt2701: Add subsystem clock controller device nodes
  IB/ipoib: Replace list_del of the neigh->list with list_del_init
  IB/ipoib: rtnl_unlock can not come after free_netdev
  IB/ipoib: Fix deadlock over vlan_mutex
  serial: 8250_port: Remove dangerous pr_debug()
  tty: goldfish: Fix a parameter of a call to free_irq
  serial: 8250: moxa: Store num_ports in brd
  drm/i915/psr: disable psr2 for resolution greater than 32X20
  ARM: 8635/1: nommu: allow enabling REMAP_VECTORS_TO_RAM
  IB/rxe: Fix a MR reference leak in check_rkey()
  IB/rxe: Add a runtime check in alloc_index()
  iio: adc: hx711: Add DT binding for avia,hx711
  iio: adc: axp288: Drop bogus AXP288_ADC_TS_PIN_CTRL register modifications
  iio: adc: imx25-gcq: Fix module autoload
  hwmon: (gl520sm) Fix overflows and crash seen when writing into limit attributes
  usb: make the MTK XHCI driver compile for older MIPS SoCs
  clk/axs10x: Clear init field in driver probe
  sh_eth: use correct name for ECMR_MPDE bit
  reset: ti_syscon: fix a ti_syscon_reset_status issue
  extcon: axp288: Use vbus-valid instead of -present to determine cable presence
  igb: re-assign hw address pointer on reset after PCI error
  ARM: dts: am335x-chilisom: Wakeup from RTC-only state by power on event
  scsi: be2iscsi: Add checks to validate CID alloc/free
  power: supply: axp288_fuel_gauge: Fix fuel_gauge_reg_readb return on error
  MIPS: ralink: Fix incorrect assignment on ralink_soc
  MIPS: ralink: Fix a typo in the pinmux setup.
  MIPS: Ensure bss section ends on a long-aligned address
  ARM: dts: r8a7790: Use R-Car Gen 2 fallback binding for msiof nodes
  RDS: RDMA: Fix the composite message user notification
  clk: sunxi-ng: fix PLL_CPUX adjusting on H3
  ARM: dts: exynos: Add CPU OPPs for Exynos4412 Prime
  drm/i915: Fix the overlay frontbuffer tracking
  GFS2: Fix reference to ERR_PTR in gfs2_glock_iter_next
  drm: bridge: add DT bindings for TI ths8135
  drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define
  ARM: config: Enable CONFIG_MMC_SDHCI_MSM_ICE flag
  ANDROID: binder: fix transaction leak.
  ANDROID: binder: Add tracing for binder priority inheritance.
  Linux 4.9.53
  swiotlb-xen: implement xen_swiotlb_dma_mmap callback
  video: fbdev: aty: do not leak uninitialized padding in clk to userspace
  KVM: VMX: use cmpxchg64
  cxl: Fix driver use count
  KVM: VMX: remove WARN_ON_ONCE in kvm_vcpu_trigger_posted_interrupt
  KVM: VMX: do not change SN bit in vmx_update_pi_irte()
  timer/sysclt: Restrict timer migration sysctl values to 0 and 1
  gfs2: Fix debugfs glocks dump
  x86/fpu: Don't let userspace set bogus xcomp_bv
  x86/mm: Fix fault error path using unsafe vma pointer
  btrfs: prevent to set invalid default subvolid
  btrfs: propagate error to btrfs_cmp_data_prepare caller
  btrfs: fix NULL pointer dereference from free_reloc_roots()
  PCI: Fix race condition with driver_override
  etnaviv: fix gem object list corruption
  xfs: validate bdev support for DAX inode flag
  kvm: nVMX: Don't allow L2 to access the hardware CR8
  KVM: VMX: Do not BUG() on out-of-bounds guest IRQ
  kvm/x86: Handle async PF in RCU read-side critical sections
  KVM: VMX: simplify and fix vmx_vcpu_pi_load
  KVM: VMX: avoid double list add with VT-d posted interrupts
  KVM: VMX: extract __pi_post_block
  arm64: fault: Route pte translation faults via do_translation_fault
  arm64: Make sure SPsel is always set
  seccomp: fix the usage of get/put_seccomp_filter() in seccomp_get_filter()
  selftests/seccomp: Support glibc 2.26 siginfo_t.h
  iw_cxgb4: put ep reference in pass_accept_req()
  iw_cxgb4: remove the stid on listen create failure
  bsg-lib: don't free job in bsg_prepare_job
  nl80211: check for the required netlink attributes presence
  vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets
  SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags
  SMB: Validate negotiate (to protect against downgrade) even if signing off
  SMB3: Warn user if trying to sign connection that authenticated as guest
  Fix SMB3.1.1 guest authentication to Samba
  PM: core: Fix device_pm_check_callbacks()
  s390/mm: fix write access check in gup_huge_pmd()
  powerpc/ftrace: Pass the correct stack pointer for DYNAMIC_FTRACE_WITH_REGS
  powerpc/tm: Flush TM only if CPU has TM feature
  powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
  KEYS: prevent KEYCTL_READ on negative key
  KEYS: prevent creating a different user's keyrings
  KEYS: fix writing past end of user-supplied buffer in keyring_read()
  security/keys: rewrite all of big_key crypto
  security/keys: properly zero out sensitive key material in big_key
  crypto: talitos - fix hashing
  crypto: talitos - fix sha224
  crypto: talitos - Don't provide setkey for non hmac hashing algs.
  crypto: drbg - fix freeing of resources
  drm/radeon: disable hard reset in hibernate for APUs
  scsi: scsi_transport_iscsi: fix the issue that iscsi_if_rx doesn't parse nlmsg properly
  md/raid5: preserve STRIPE_ON_UNPLUG_LIST in break_stripe_batch_list
  md/raid5: fix a race condition in stripe batch
  tracing: Erase irqsoff trace with empty write
  tracing: Fix trace_pipe behavior for instance traces
  KVM: PPC: Book3S HV: Protect updates to spapr_tce_tables list
  KVM: PPC: Book3S: Fix race and leak in kvm_vm_ioctl_create_spapr_tce()
  genirq: Make sparse_irq_lock protect what it should protect
  mac80211: flush hw_roc_start work before cancelling the ROC
  mac80211_hwsim: Use proper TX power
  mac80211: fix VLAN handling with TXQs
  fs/proc: Report eip/esp in /prod/PID/stat for coredumping
  cifs: release auth_key.response for reconnect.
  cifs: release cifs root_cred after exit_cifs
  ANDROID: add script to fetch android kernel config fragments
  FROMLIST: binder: fix use-after-free in binder_transaction()
  FROMLIST: binder: fix use-after-free in binder_transaction()
  UPSTREAM: ipv6: fib: Unlink replaced routes from their nodes
  Linux 4.9.52
  bcache: fix bch_hprint crash and improve output
  bcache: fix for gc and write-back race
  bcache: Correct return value for sysfs attach errors
  bcache: correct cache_dirty_target in __update_writeback_rate()
  bcache: do not subtract sectors_to_gc for bypassed IO
  bcache: Fix leak of bdev reference
  bcache: initialize dirty stripes in flash_dev_run()
  PM / devfreq: Fix memory leak when fail to register device
  media: uvcvideo: Prevent heap overflow when accessing mapped controls
  media: v4l2-compat-ioctl32: Fix timespec conversion
  s390/mm: fix race on mm->context.flush_mm
  s390/mm: fix local TLB flushing vs. detach of an mm address space
  net/netfilter/nf_conntrack_core: Fix net_conntrack_lock()
  PCI: pciehp: Report power fault only once until we clear it
  PCI: shpchp: Enable bridge bus mastering if MSI is enabled
  ARC: Re-enable MMU upon Machine Check exception
  tracing: Apply trace_clock changes to instance max buffer
  tracing: Add barrier to trace_printk() buffer nesting modification
  ftrace: Fix memleak when unregistering dynamic ops when tracing disabled
  ftrace: Fix selftest goto location on error
  scsi: qla2xxx: Fix an integer overflow in sysfs code
  scsi: qla2xxx: Correction to vha->vref_count timeout
  scsi: sg: fixup infoleak when using SG_GET_REQUEST_TABLE
  scsi: sg: factor out sg_fill_request_table()
  scsi: sg: off by one in sg_ioctl()
  scsi: sg: use standard lists for sg_requests
  scsi: sg: remove 'save_scat_len'
  scsi: storvsc: fix memory leak on ring buffer busy
  scsi: megaraid_sas: Return pended IOCTLs with cmd_status MFI_STAT_WRONG_STATE in case adapter is dead
  scsi: megaraid_sas: Check valid aen class range to avoid kernel panic
  scsi: megaraid_sas: set minimum value of resetwaittime to be 1 secs
  scsi: zfcp: trace high part of "new" 64 bit SCSI LUN
  scsi: zfcp: trace HBA FSF response by default on dismiss or timedout late response
  scsi: zfcp: fix payload with full FCP_RSP IU in SCSI trace records
  scsi: zfcp: fix missing trace records for early returns in TMF eh handlers
  scsi: zfcp: fix passing fsf_req to SCSI trace on TMF to correlate with HBA
  scsi: zfcp: fix capping of unsuccessful GPN_FT SAN response trace records
  scsi: zfcp: add handling for FCP_RESID_OVER to the fcp ingress path
  scsi: zfcp: fix queuecommand for scsi_eh commands when DIX enabled
  skd: Submit requests to firmware before triggering the doorbell
  skd: Avoid that module unloading triggers a use-after-free
  md/bitmap: disable bitmap_resize for file-backed bitmaps.
  block: Relax a check in blk_start_queue()
  powerpc: Fix DAR reporting when alignment handler faults
  ext4: fix quota inconsistency during orphan cleanup for read-only mounts
  ext4: fix incorrect quotaoff if the quota feature is enabled
  crypto: AF_ALG - remove SGL terminator indicator when chaining
  crypto: ccp - Fix XTS-AES-128 support on v5 CCPs
  MIPS: math-emu: <MADDF|MSUBF>.D: Fix accuracy (64-bit case)
  MIPS: math-emu: <MADDF|MSUBF>.S: Fix accuracy (32-bit case)
  MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Clean up "maddf_flags" enumeration
  MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Fix some cases of zero inputs
  MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Fix some cases of infinite inputs
  MIPS: math-emu: <MADDF|MSUBF>.<D|S>: Fix NaN propagation
  MIPS: math-emu: Handle zero accumulator case in MADDF and MSUBF separately
  MIPS: math-emu: MINA.<D|S>: Fix some cases of infinity and zero inputs
  MIPS: math-emu: <MAXA|MINA>.<D|S>: Fix cases of both infinite inputs
  MIPS: math-emu: <MAXA|MINA>.<D|S>: Fix cases of input values with opposite signs
  MIPS: math-emu: <MAX|MIN>.<D|S>: Fix cases of both inputs negative
  MIPS: math-emu: <MAX|MAXA|MIN|MINA>.<D|S>: Fix cases of both inputs zero
  MIPS: math-emu: <MAX|MAXA|MIN|MINA>.<D|S>: Fix quiet NaN propagation
  Input: i8042 - add P57 to the keyboard reset table
  pinctrl/: save pin registers over suspend/resume
  tty: fix __tty_insert_flip_char regression
  tty: improve tty_insert_flip_char() slow path
  tty: improve tty_insert_flip_char() fast path
  IB/addr: Fix setting source address in addr6_resolve()
  drm/sun4i: Implement drm_driver lastclose to restore fbdev console
  IB/{qib, hfi1}: Avoid flow control testing for RDMA write operation
  orangefs: Don't clear SGID when inheriting ACLs
  mm: prevent double decrease of nr_reserved_highatomic
  NFSv4: Fix callback server shutdown
  SUNRPC: Refactor svc_set_num_threads()
  drm/msm/sde: Expose the HDR support capability of the chipset
  UPSTREAM: drm/atomic: Handle -EDEADLK with out-fences correctly
  UPSTREAM: sched/fair: Fix FTQ noise bench regression
  UPSTREAM: fib_rules: fix error return code
  UPSTREAM: ipv4: add missing initialization for flowi4_uid
  ANDROID: Squashfs: optimize reading uncompressed data
  ANDROID: Squashfs: implement .readpages()
  ANDROID: Squashfs: replace buffer_head with BIO
  ANDROID: Squashfs: refactor page_actor
  ANDROID: Squashfs: remove the FILE_CACHE option
  FROMLIST: android: binder: Don't get mm from task
  FROMLIST: android: binder: Remove unused vma argument
  FROMLIST: android: binder: Drop lru lock in isolate callback
  ANDROID: Use sk_uid to replace uid get from socket file
  ANDROID: nf: xt_qtaguid: fix handling for cases where tunnels are used.
  Revert "ANDROID: Use sk_uid to replace uid get from socket file"
  ANDROID: USB gadget: mtp: Fix hang in ioctl(MTP_RECEIVE_FILE) for WritePartialObject
  FROMLIST: binder: fix an ret value override
  FROMLIST: binder: fix memory corruption in binder_transaction binder

Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>
Change-Id: I7dea2340cfd60cff2c5b4320b130ffe2b196d269

Abhijit Trivedi   commited 2017-11-09 18:28:22 -08:00
e78f6619e8
msm: camera: isp: Clean the ISP Blob Cmd processing
Existing handling of generic Blob Cmd includes a couple of function
call jumps and everytime kzalloc + kfree. Cleanup the processing to
avoid these.

Change-Id: I88291a6aa289652ed0f3f4aaee5ae578862a0a1a
Signed-off-by: Harsh Shah <harshs@codeaurora.org>

Harsh Shah   authored and   Karthik Anantha Ram   commited 2017-11-08 12:37:26 -08:00
9d676ddcd2
Merge "Merge remote-tracking branch '4.9/tmp-4b2b8b9' into msm-4.9"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-06 17:00:37 -08:00
f79dd42b80
Merge "msm: ipa: Add support for UL Firewall"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-06 17:00:33 -08:00
02dea65c0a
Merge "msm: ipa: Add support for per client statistics and UL firewall"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-06 17:00:33 -08:00
c141019655
Merge remote-tracking branch '4.9/tmp-4b2b8b9' into msm-4.9
* 4.9/tmp-4b2b8b9:
  Linux 4.9.60
  ecryptfs: fix dereference of NULL user_key_payload
  regulator: fan53555: fix I2C device ids
  ipsec: Fix aborted xfrm policy dump crash
  cfg80211: fix connect/disconnect edge cases
  can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
  can: kvaser_usb: Correct return value in printout
  can: sun4i: fix loopback mode
  drm/amd/powerplay: fix uninitialized variable
  scsi: sg: Re-fix off by one in sg_fill_request_table()
  scsi: zfcp: fix erp_action use-before-initialize in REC action trace
  assoc_array: Fix a buggy node-splitting case
  Input: gtco - fix potential out-of-bound access
  Input: elan_i2c - add ELAN0611 to the ACPI table
  xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
  fuse: fix READDIRPLUS skipping an entry
  spi: bcm-qspi: Fix use after free in bcm_qspi_probe() in error path
  spi: uapi: spidev: add missing ioctl header
  KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM
  usb: xhci: Handle error condition in xhci_stop_device()
  ceph: unlock dangling spinlock in try_flush_caps()
  ALSA: hda - fix headset mic problem for Dell machines with alc236
  ALSA: hda/realtek - Add support for ALC236/ALC3204
  workqueue: replace pool->manager_arb mutex with a flag

Conflicts:
	drivers/usb/host/xhci-hub.c

Change-Id: I6de307270a5b951e4fb5c9ee62781a7b4f206b26
Signed-off-by: Kyle Yan <kyan@codeaurora.org>

Kyle Yan   commited 2017-11-05 14:31:07 -08:00
07f9309c8d
Merge "BACKPORT: net: xfrm: support setting an output mark."
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-03 14:19:08 -07:00
02cf388d52
Merge "drm/msm: pass the HDR metadata sent from userspace to sink"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-03 02:54:32 -07:00
1676d30d49
Merge "Revert "rtc: alarm: Add power-on alarm feature""
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-11-03 02:54:24 -07:00
b12032f335
BACKPORT: net: xfrm: support setting an output mark.
On systems that use mark-based routing it may be necessary for
routing lookups to use marks in order for packets to be routed
correctly. An example of such a system is Android, which uses
socket marks to route packets via different networks.

Currently, routing lookups in tunnel mode always use a mark of
zero, making routing incorrect on such systems.

This patch adds a new output_mark element to the xfrm state and
a corresponding XFRMA_OUTPUT_MARK netlink attribute. The output
mark differs from the existing xfrm mark in two ways:

1. The xfrm mark is used to match xfrm policies and states, while
   the xfrm output mark is used to set the mark (and influence
   the routing) of the packets emitted by those states.
2. The existing mark is constrained to be a subset of the bits of
   the originating socket or transformed packet, but the output
   mark is arbitrary and depends only on the state.

The use of a separate mark provides additional flexibility. For
example:

- A packet subject to two transforms (e.g., transport mode inside
  tunnel mode) can have two different output marks applied to it,
  one for the transport mode SA and one for the tunnel mode SA.
- On a system where socket marks determine routing, the packets
  emitted by an IPsec tunnel can be routed based on a mark that
  is determined by the tunnel, not by the marks of the
  unencrypted packets.
- Support for setting the output marks can be introduced without
  breaking any existing setups that employ both mark-based
  routing and xfrm tunnel mode. Simply changing the code to use
  the xfrm mark for routing output packets could xfrm mark could
  change behaviour in a way that breaks these setups.

If the output mark is unspecified or set to zero, the mark is not
set or changed.

[backport of upstream 077fbac405bfc6d41419ad6c1725804ad4e9887c]

CRs-Fixed: 2137445
Bug: 63589535
Test: https://android-review.googlesource.com/452776/ passes
Tested: make allyesconfig; make -j64
Tested: https://android-review.googlesource.com/452776
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Change-Id: I76120fba036e21780ced31ad390faf491ea81e52
Git-commit: 34e23dee72
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

Lorenzo Colitti   authored and   Subash Abhinov Kasiviswanathan   commited 2017-11-02 18:47:57 -06:00
bf25c79c30
This is the 4.9.60 stable release
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAln63AwACgkQONu9yGCS
 aT5IjA/7Bsph+j+VQg7LYDK+RsXj5MAVMsb5Jd0h/01V6fWm/Rt1fLusW+zuKHKp
 izA7LQPdfCTrJWmulQXnLfvhSRgxgM7dFjRf4gtCz5ytaYwoUG7PuM7U6sO8s4dt
 rZgdrDweVXMLlQ0oGia4s3dOMVKwnNoTlmTnnhJ1Vv9eLmUY6SHvLmpn4/ne/n8G
 0QV0qk6mgeYgrf+GcR3kqp3a0Yd0gpkpPMwVBlGyydRrsXWlqOYJy82u0mM/H+qq
 /Tt/6j8YW4fpTEGBquLgP6ySCjyFGI//mKKa/xgb0gCvuHS5YeTbOxYQcfaHfGvm
 UAunrWccQgcaXwHs+6MZuv6JqEobx9ps0hORtv4nj/Oruciy6D8ALrDezkQpj/w5
 H0BCCCkRMmgQuh8NQ4e4ZGtsH0oPjHquC1BmO9cpd7ASrryAqBdLDQQa/ae+bpP7
 lIP8xTZc+XThuJ3n5U1r+9TrcpGoKHjceL6atw4OVhcdXqCZkZdyrtHy2Y3x2DdJ
 ESUpxywuL1M8lRsw5+4BVqgekDHGjkLaCW0wscaevBIpboXY41cY3BPOVqZB3L8M
 DfZZPURqwrmyj97cXnUGz0r8DNFcnIVpF0OxBgZhi7Kyc/wB68JjGl+pxRT31pD9
 srIfkivAEUvfWDW5+mdez2X3cXpiM5UZB+TEZ1zPbAbaQg7TiUU=
 =IF2/
 -----END PGP SIGNATURE-----

Merge 4.9.60 into android-4.9-o

Changes in 4.9.60
	workqueue: replace pool->manager_arb mutex with a flag
	ALSA: hda/realtek - Add support for ALC236/ALC3204
	ALSA: hda - fix headset mic problem for Dell machines with alc236
	ceph: unlock dangling spinlock in try_flush_caps()
	usb: xhci: Handle error condition in xhci_stop_device()
	KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM
	spi: uapi: spidev: add missing ioctl header
	spi: bcm-qspi: Fix use after free in bcm_qspi_probe() in error path
	fuse: fix READDIRPLUS skipping an entry
	xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
	Input: elan_i2c - add ELAN0611 to the ACPI table
	Input: gtco - fix potential out-of-bound access
	assoc_array: Fix a buggy node-splitting case
	scsi: zfcp: fix erp_action use-before-initialize in REC action trace
	scsi: sg: Re-fix off by one in sg_fill_request_table()
	drm/amd/powerplay: fix uninitialized variable
	can: sun4i: fix loopback mode
	can: kvaser_usb: Correct return value in printout
	can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
	cfg80211: fix connect/disconnect edge cases
	ipsec: Fix aborted xfrm policy dump crash
	regulator: fan53555: fix I2C device ids
	ecryptfs: fix dereference of NULL user_key_payload
	Linux 4.9.60

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Greg Kroah-Hartman   commited 2017-11-02 10:40:25 +01:00
4b2b8b9922
spi: uapi: spidev: add missing ioctl header
commit a2b4a79b88b24c49d98d45a06a014ffd22ada1a4 upstream.

The SPI_IOC_MESSAGE() macro references _IOC_SIZEBITS. Add linux/ioctl.h
to make sure this macro is defined. This fixes the following build
failure of lcdproc with the musl libc:

In file included from .../sysroot/usr/include/sys/ioctl.h:7:0,
                 from hd44780-spi.c:31:
hd44780-spi.c: In function 'spi_transfer':
hd44780-spi.c:89:24: error: '_IOC_SIZEBITS' undeclared (first use in this function)
  status = ioctl(p->fd, SPI_IOC_MESSAGE(1), &xfer);
                        ^

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Baruch Siach   authored and   Greg Kroah-Hartman   commited 2017-11-02 09:49:13 +01:00
1dfea1eeac
Revert "rtc: alarm: Add power-on alarm feature"
This reverts commit 2e1a4aefef.

Power off alarm is not set via alarmtimer now. Remove the changes
of power off alarm's previous design.

CRs-Fixed: 2132189
Change-Id: I0f60bec0d94c93c4f2a89ae86a1b0a0d04aa9e48
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>

Mao Jinlong   authored and   Gerrit - the friendly Code Review server   commited 2017-11-01 01:19:42 -07:00
ea47aaf9bd
drm/msm: pass the HDR metadata sent from userspace to sink
Use metadata information sent from userspace to configure sink.

This info is used later on to program the HDMI specific
infoframe registers.

CRs-Fixed: 2110071
Change-Id: I26634452d8c3ab7ab49a65e89ad52a3961c64855
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>

Ajay Singh Parmar   commited 2017-11-01 00:33:20 -07:00
e927aa479b
drm/msm: add sink capabilities for HDR support
Populate HDR sink capabilities to a DRM blob.

These capabilities are used by the userspace
to calculate the sink HDR properties and set them.

CRs-Fixed: 2110071
Change-Id: I7c2dbca375c456052ad73889b011553090bcf8f1
Signed-off-by: Srikanth Rajagopalan <rasrik@codeaurora.org>
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>

Srikanth Rajagopalan   authored and   Ajay Singh Parmar   commited 2017-11-01 00:32:42 -07:00
30384d1120
Merge "esoc: Fix irq unbalance wake disable warning"
Linux Build Service Account   authored and   Gerrit - the friendly Code Review server   commited 2017-10-30 13:48:14 -07:00
60407311c3