Commit graph

597802 commits

Author SHA1 Message Date
Linux Build Service Account
bc60923a9f Merge "mm/migration: make isolate_movable_page() return int type" 2018-03-09 02:47:52 -08:00
Linux Build Service Account
b36bac6b0d Merge "mm/hotplug: enable memory hotplug for non-lru movable pages" 2018-03-09 02:47:52 -08:00
Linux Build Service Account
951119485b Merge "profiler: memset cnt_buf before use" 2018-03-09 02:47:50 -08:00
Linux Build Service Account
b83a3d1c47 Merge "soc: qcom: subsystem_notif_virt: Add virtual subsystem notification driver" 2018-03-09 02:47:49 -08:00
Linux Build Service Account
07324253e2 Merge "DRM: SDE: Fix potential buffer overflow in SDE encoder" 2018-03-08 04:27:51 -08:00
Anant Goel
f64af1ec50 soc: qcom: subsystem_notif_virt: Add virtual subsystem notification driver
The guest VM uses this driver to communicate subsystem state related
notifications to a backend driver via the virtual device's registers.

Change-Id: I612fcb641c4d531c1d2c0fd18f44f7ebff040f2c
Signed-off-by: Anant Goel <anantg@codeaurora.org>
2018-03-07 12:05:28 -08:00
Linux Build Service Account
b02928f9da Merge "i2c-msm-v2: Replace HW recovery mechanism with SW bit-banging" 2018-03-07 09:16:40 -08:00
Linux Build Service Account
1ccffb8bdd Merge "ais: match type to avoid array overflow" 2018-03-07 09:16:39 -08:00
Linux Build Service Account
5f0137e535 Merge "sched: add sched_get_cpu_last_busy_time() API" 2018-03-07 09:16:38 -08:00
Linux Build Service Account
bbfcd05a31 Merge "Revert "ARM: dts: msm: Disable SPI CAN controller on msm8996 CV2X boards"" 2018-03-07 09:16:37 -08:00
Linux Build Service Account
52981940d7 Merge "clk: qcom: mdss: improve DSI PLL's performance" 2018-03-07 09:16:35 -08:00
Linux Build Service Account
a3c86eca63 Merge "msm: vidc: enable port reconfig for thumbnail session" 2018-03-07 09:16:34 -08:00
Linux Build Service Account
ef0769db30 Merge "Merge android-4.4.118 (5f7f76a) into msm-4.4" 2018-03-07 09:16:32 -08:00
Linux Build Service Account
296628bc78 Merge "Merge android-4.4.117 (4ec3656) into msm-4.4" 2018-03-07 09:16:31 -08:00
Linux Build Service Account
d30c02ed5b Merge "Merge android-4.4.116 (20ddb25) into msm-4.4" 2018-03-07 09:16:30 -08:00
Linux Build Service Account
40cb358707 Merge "clk: msm: Add reset support in dummy clock driver" 2018-03-07 09:16:29 -08:00
Gustavo Solaira
7327c28169 Revert "ARM: dts: msm: Disable SPI CAN controller on msm8996 CV2X boards"
This reverts commit a8c85fc795.
Reverted because support for MPC5746C SPI-CAN is being
added back to the platform.

Change-Id: Ib14caf39a8cba9c6028abceb85adcd43df53ba06
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-03-06 22:47:50 -08:00
Lei wang
94e90bcf7f profiler: memset cnt_buf before use
fix cnf_buf.cmd is uninitialized in bw_profiling_get

Change-Id: I9638fe423e6768c66a85e80c0d5175b8a33c1901
Signed-off-by: Lei wang <leiwan@codeaurora.org>
2018-03-06 22:04:33 -08:00
Linux Build Service Account
834739e911 Merge "drm/msm-hyp: overwrite hyp ioctls used by libgbm" 2018-03-06 20:57:58 -08:00
Linux Build Service Account
c70b573a90 Merge "ath10k: fix the invalid STA disconnect after wow resume" 2018-03-06 20:57:57 -08:00
Linux Build Service Account
25eb087db9 Merge "defconfig: arm64: msm: Enable SPMI msm8996 virtual platform" 2018-03-06 20:57:55 -08:00
Linux Build Service Account
39e3389b79 Merge "ASoC: msm: Support Channel Mixer Cfg" 2018-03-06 20:57:54 -08:00
Linux Build Service Account
83efda84fc Merge "ARM: dts: msm: Disable usb phy by default on msm8996 vplatform" 2018-03-06 20:57:53 -08:00
Linux Build Service Account
2ad3d8cb64 Merge "spmi: msm: correct len part in formatted cmd value." 2018-03-06 20:57:51 -08:00
Linux Build Service Account
df41a54a67 Merge "drm/msm: HPD_OFF Property for SDE HDMI Connector" 2018-03-06 20:57:50 -08:00
Guchun Chen
cf8812ee6e clk: qcom: mdss: improve DSI PLL's performance
To improve performance margin for DSI's PLL at cold temperature case,
the value of DSIPHY_PLL_PLL_ICPMSET should be changed from 0x24 to 0x3f.

Change-Id: I139e37e137355c5e8f0b3bebd28b23a09593dd13
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-03-07 11:10:56 +08:00
Camus Wong
74f60692b1 drm/msm-hyp: overwrite hyp ioctls used by libgbm
Handle ioctls called by libgbm in the virtual kernel driver
to support front-end library and avoid modifying libgbm.

Change-Id: Ie4e567cea7338b4ba68080decf85dfa45e040dac
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-03-06 09:54:53 -05:00
Pavankumar Kondeti
3c44396107 sched: add sched_get_cpu_last_busy_time() API
sched_get_cpu_last_busy_time() returns the last time stamp when
a given CPU is busy with more than 2 runnable tasks or has load
greater than 50% of it's max capacity. The LPM driver can make
use of this API and create a policy to prevent a recently loaded
CPU entering deep sleep state.

This API is implemented only for the higher capacity CPUs in
the system. It returns 0 for other CPUs.

Change-Id: I97ef47970a71647f4f55f21165d0cc1351770a53
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2018-03-06 19:46:33 +05:30
Sarada Prasanna Garnayak
ab809bba58 ath10k: fix the invalid STA disconnect after wow resume
Clear the previous wakeup reason data and reset the wakeup
reason event field to avoid the STA disconnect with invalid
wow event.

CRs-Fixed: 2199100
Change-Id: If45b5ae6e6f93ab9068b59a5e31f46b829363936
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2018-03-06 03:57:03 -08:00
Andy Sun
eed92b4a0f ais: match type to avoid array overflow
Fix buffer overflow and array index out of bounds cases.
Because size of int(32bits) unequal to size of long(64bits). 

Change-Id: I45a70ec5b6926698bb444fc78f85785bc4a25ea5
Signed-off-by: Andy Sun <bins@codeaurora.org>
2018-03-06 16:16:46 +08:00
Linux Build Service Account
99b73ed59a Merge "soc: qcom: scm_qcpe: Derive HAB id from HAB vmid dt node" 2018-03-05 14:12:24 -08:00
Linux Build Service Account
b6633295ce Merge "msm: kgsl: Limit the maximum number of contexts" 2018-03-05 14:12:22 -08:00
Linux Build Service Account
307aaed1e4 Merge "msm: mdss: Fix scalar LUT handling" 2018-03-05 14:12:21 -08:00
Paras Nagda
6d5592aa85 msm: vidc: enable port reconfig for thumbnail session
Send port reconfig to client for thumbnail session
when driver received sufficient resources from firmware.

This is needed as there are issues in DPB management
in firmware.

Change-Id: I7c2992e6be87fd277b209554d1aa7c4d0a088738
Signed-off-by: Paras Nagda <pnagda@codeaurora.org>
2018-03-05 05:52:34 -08:00
Harshdeep Dhatt
3f5a22eca9 msm: kgsl: Limit the maximum number of contexts
Enforce a limit of 200 contexts per process. This is done so
that a process cannot use up all the available contexts and
prevent other processes from starving.

Change-Id: I6eda123128381a213315561cd42335e0944f1f55
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
Signed-off-by: Archana Obannagari <aobann@codeaurora.org>
2018-03-05 01:17:09 -08:00
Yimin Peng
2c6e820516 spmi: msm: correct len part in formatted cmd value.
When the bytes count required by SPMI clients is 8, read and write
fail. This was observed when PMIC MPPs initialized. Fix this by
adding bytes count restore in cmd formation as read and write process.

Change-Id: I56dbbc0b8e99727c29ddae568ce6f17195888b4a
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-03-05 15:43:31 +08:00
Harshdeep Dhatt
b67de7b731 msm: kgsl: Increase memstore size
Increase the memstore size to 32k. Memstore has for long
been limited to 200 contexts and now it will be 814.

Change-Id: I1287669f0be38afe13ff8e386f5296e8f4e77627
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
Signed-off-by: Archana Obannagari <aobann@codeaurora.org>
2018-03-05 12:10:15 +05:30
Zhiqiang Tu
a1ef93ac8d ARM: dts: msm: Disable usb phy by default on msm8996 vplatform
Disable usb phy by default and only enable them for the targets
which require the support for usb phy.

Change-Id: I55d5cba5ef06d3269cc9600dfec866c0f88b31ab
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
2018-03-05 09:16:34 +08:00
Amit Blay
552c3a28c9 soc: qcom: scm_qcpe: Derive HAB id from HAB vmid dt node
Derive the QCPE HAB id from the HAB vmid DTS node, rather
than have it hard coded into the driver.

Change-Id: I29ec7647890f8bc194d31f0402c5ed314572462f
Signed-off-by: Amit Blay <ablay@codeaurora.org>
2018-03-04 10:06:03 +02:00
Linux Build Service Account
a337c17ceb Merge "msm: kgsl: Correct memory type update in IOCTL_KGSL_GPUOBJ_SET_INFO" 2018-03-02 23:05:09 -08:00
Linux Build Service Account
6e7aa98702 Merge "ARM: dts: msm: Add support for modem test tools on msm8996 vplatform" 2018-03-02 23:05:08 -08:00
Linux Build Service Account
1826c38271 Merge "soc: qcom: hab: clean the pr_fmt redefined build warning" 2018-03-02 23:05:07 -08:00
Linux Build Service Account
37a1744d91 Merge "defconfig: msm: Enable FW loader user space helper for GVM" 2018-03-02 23:05:05 -08:00
Deepak Kumar
d567b416ed msm: kgsl: Correct memory type update in IOCTL_KGSL_GPUOBJ_SET_INFO
A bad user can pass memory type parameter value greater than 255.
Limit the memory type value to valid range before updating memory
descriptor flags to avoid incorrect flag update.

Change-Id: I23ce69584d1e2c9969583461ee942c5046e7cdbc
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2018-03-02 09:47:11 -08:00
Yimin Peng
e8c8a8a43e defconfig: arm64: msm: Enable SPMI msm8996 virtual platform
Add virtual SPMI PMIC arbiter support on virtual platform.

Change-Id: I3642d41c5474f975f18f5d19136284b632868389
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-03-02 15:18:08 +08:00
Yimin Peng
4f0194fd35 ARM: dts: msm: Add SPMI and PMIC devices for msm8996 vplatform
Add virtual SPMI Arbiter and PMIC clients which are disabled by default.

Change-Id: I39e5d22bff0f796716a34d7d9ff0e2040cf2d61b
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-03-02 15:16:34 +08:00
Cong Tang
4449171493 ASoC: msm: Support Channel Mixer Cfg
Enhance Channel Mixer controls for MultiMedia Frontend.

Change-Id: Ifedac25de5ae6bad1092b66ec405bba66a80f608
Signed-off-by: Cong Tang <congt@codeaurora.org>
2018-03-02 14:56:24 +08:00
Ramachandran Venkataramani
55ebadeee8 ARM: dts: msm: Add support for modem test tools on msm8996 vplatform
Add smdpkt and glinkpkt devices with the SSR handlers to
support PC based tools to test the modem and adsp.

Change-Id: I2a77f6d01ad13b9c061eacbf4d08af12d8e183a7
Signed-off-by: Ramachandran Venkataramani <ramavenk@codeaurora.org>
2018-03-01 17:38:42 -08:00
Sreelakshmi Gownipalli
94cda67dae diag: Add conditional check for len in dci_process_ctrl_status()
Add correct conditional check for len in dci_process_ctrl_status() to
prevent buffer overflow.

Change-Id: Id73ed1c8b104428eceef0544ce2858160cc08fd2
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
2018-03-01 11:07:39 -08:00
Srinivasarao P
8720164c1a Merge android-4.4.118 (5f7f76a) into msm-4.4
* refs/heads/tmp-5f7f76a
  Linux 4.4.118
  net: dst_cache_per_cpu_dst_set() can be static
  crypto: s5p-sss - Fix kernel Oops in AES-ECB mode
  KVM: nVMX: invvpid handling improvements
  KVM: VMX: clean up declaration of VPID/EPT invalidation types
  kvm: nVMX: Fix kernel panics induced by illegal INVEPT/INVVPID types
  KVM: nVMX: vmx_complete_nested_posted_interrupt() can't fail
  KVM: nVMX: kmap() can't fail
  x86/speculation: Fix typo IBRS_ATT, which should be IBRS_ALL
  x86/spectre: Simplify spectre_v2 command line parsing
  x86/retpoline: Avoid retpolines for built-in __init functions
  x86/kvm: Update spectre-v1 mitigation
  x86/paravirt: Remove 'noreplace-paravirt' cmdline option
  x86/spectre: Fix spelling mistake: "vunerable"-> "vulnerable"
  x86/spectre: Report get_user mitigation for spectre_v1
  nl80211: Sanitize array index in parse_txq_params
  vfs, fdtable: Prevent bounds-check bypass via speculative execution
  x86/syscall: Sanitize syscall table de-references under speculation
  x86/get_user: Use pointer masking to limit speculation
  x86: Introduce barrier_nospec
  x86: Implement array_index_mask_nospec
  array_index_nospec: Sanitize speculative array de-references
  Documentation: Document array_index_nospec
  x86/spectre: Check CONFIG_RETPOLINE in command line parser
  x86/cpu/bugs: Make retpoline module warning conditional
  x86/bugs: Drop one "mitigation" from dmesg
  x86/nospec: Fix header guards names
  module/retpoline: Warn about missing retpoline in module
  KVM: VMX: Make indirect call speculation safe
  KVM: x86: Make indirect calls in emulator speculation safe
  x86/retpoline: Remove the esp/rsp thunk
  KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously
  kasan: rework Kconfig settings
  drm/gma500: remove helper function
  x86/microcode/AMD: Change load_microcode_amd()'s param to bool to fix preemptibility bug
  genksyms: Fix segfault with invalid declarations
  dell-wmi, dell-laptop: depends DMI
  netlink: fix nla_put_{u8,u16,u32} for KASAN
  ASoC: Intel: Kconfig: fix build when ACPI is not enabled
  ARM: tegra: select USB_ULPI from EHCI rather than platform
  ncr5380: shut up gcc indentation warning
  usb: phy: msm add regulator dependency
  idle: i7300: add PCI dependency
  binfmt_elf: compat: avoid unused function warning
  isdn: sc: work around type mismatch warning
  power: bq27xxx_battery: mark some symbols __maybe_unused
  Revert "power: bq27xxx_battery: Remove unneeded dependency in Kconfig"
  ncpfs: fix unused variable warning
  gpio: xgene: mark PM functions as __maybe_unused
  net: hp100: remove unnecessary #ifdefs
  dmaengine: zx: fix build warning
  perf/x86: Shut up false-positive -Wmaybe-uninitialized warning
  wireless: cw1200: use __maybe_unused to hide pm functions_
  cw1200: fix bogus maybe-uninitialized warning
  v4l: remove MEDIA_TUNER dependency for VIDEO_TUNER
  hdpvr: hide unused variable
  drm/gma500: Sanity-check pipe index
  serial: 8250_mid: fix broken DMA dependency
  ASoC: rockchip: use __maybe_unused to hide st_irq_syscfg_resume
  ISDN: eicon: reduce stack size of sig_ind function
  em28xx: only use mt9v011 if camera support is enabled
  go7007: add MEDIA_CAMERA_SUPPORT dependency
  KVM: add X86_LOCAL_APIC dependency
  Input: tca8418_keypad - hide gcc-4.9 -Wmaybe-uninitialized warning
  drm/nouveau: hide gcc-4.9 -Wmaybe-uninitialized
  tc358743: fix register i2c_rd/wr functions
  staging: unisys: visorinput depends on INPUT
  i2c: remove __init from i2c_register_board_info()
  b2c2: flexcop: avoid unused function warnings
  infiniband: cxgb4: use %pR format string for printing resources
  iio: adc: axp288: remove redundant duplicate const on axp288_adc_channels
  ASoC: mediatek: add i2c dependency
  genirq/msi: Add stubs for get_cached_msi_msg/pci_write_msi_msg
  tty: cyclades: cyz_interrupt is only used for PCI
  drm/vmwgfx: use *_32_bits() macros
  tlan: avoid unused label with PCI=n
  tc1100-wmi: fix build warning when CONFIG_PM not enabled
  ipv4: ipconfig: avoid unused ic_proto_used symbol
  netfilter: ipvs: avoid unused variable warnings
  x86/platform/olpc: Fix resume handler build warning
  staging: wilc1000: fix kbuild test robot error
  rtlwifi: fix gcc-6 indentation warning
  USB: cdc_subset: only build when one driver is enabled
  hwrng: exynos - use __maybe_unused to hide pm functions
  fbdev: sm712fb: avoid unused function warnings
  Drivers: hv: vmbus: fix build warning
  modsign: hide openssl output in silent builds
  fbdev: s6e8ax0: avoid unused function warnings
  mtd: cfi: enforce valid geometry configuration
  mtd: sh_flctl: pass FIFO as physical address
  amd-xgbe: Fix unused suspend handlers build warning
  fbdev: auo_k190x: avoid unused function warnings
  driver-core: use 'dev' argument in dev_dbg_ratelimited stub
  target/user: Fix cast from pointer to phys_addr_t
  tty: hvc_xen: hide xen_console_remove when unused
  usb: musb/ux500: remove duplicate check for dma_is_compatible
  pwc: hide unused label
  SCSI: initio: remove duplicate module device table
  scsi: mvumi: use __maybe_unused to hide pm functions
  video: Use bool instead int pointer for get_opt_bool() argument
  fbdev: sis: enforce selection of at least one backend
  staging: ste_rmi4: avoid unused function warnings
  video: fbdev: sis: remove unused variable
  scsi: fdomain: drop fdomain_pci_tbl when built-in
  mptfusion: hide unused seq_mpt_print_ioc_summary function
  mtd: maps: add __init attribute
  mtd: ichxrom: maybe-uninitialized with gcc-4.9
  md: avoid warning for 32-bit sector_t
  profile: hide unused functions when !CONFIG_PROC_FS
  dpt_i2o: fix build warning
  drivers/net: fix eisa_driver probe section mismatch
  scsi: sim710: fix build warning
  x86/boot: Avoid warning for zero-filling .bss
  thermal: spear: use __maybe_unused for PM functions
  ssb: mark ssb_bus_register as __maybe_unused
  reiserfs: avoid a -Wmaybe-uninitialized warning
  ALSA: hda/ca0132 - fix possible NULL pointer use
  arm64: Kconfig: select COMPAT_BINFMT_ELF only when BINFMT_ELF is set
  scsi: advansys: fix uninitialized data access
  x86/platform: Add PCI dependency for PUNIT_ATOM_DEBUG
  x86: add MULTIUSER dependency for KVM
  thermal: fix INTEL_SOC_DTS_IOSF_CORE dependencies
  x86/build: Silence the build with "make -s"
  tools build: Add tools tree support for 'make -s'
  x86/fpu/math-emu: Fix possible uninitialized variable use
  arm64: define BUG() instruction without CONFIG_BUG
  x86/ras/inject: Make it depend on X86_LOCAL_APIC=y
  scsi: advansys: fix build warning for PCI=n
  video: fbdev: via: remove possibly unused variables
  platform/x86: intel_mid_thermal: Fix suspend handlers unused warning
  gpio: intel-mid: Fix build warning when !CONFIG_PM
  vmxnet3: prevent building with 64K pages
  isdn: icn: remove a #warning
  virtio_balloon: prevent uninitialized variable use
  hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close
  xen: XEN_ACPI_PROCESSOR is Dom0-only
  x86/mm/kmmio: Fix mmiotrace for page unaligned addresses
  mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep
  dmaengine: jz4740: disable/unprepare clk if probe fails
  drm/armada: fix leak of crtc structure
  xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies.
  spi: sun4i: disable clocks in the remove function
  ASoC: rockchip: disable clock on error
  clk: fix a panic error caused by accessing NULL pointer
  dmaengine: at_hdmac: fix potential NULL pointer dereference in atc_prep_dma_interleaved
  dmaengine: ioat: Fix error handling path
  509: fix printing uninitialized stack memory when OID is empty
  btrfs: Fix possible off-by-one in btrfs_search_path_in_tree
  net_sched: red: Avoid illegal values
  net_sched: red: Avoid devision by zero
  gianfar: fix a flooded alignment reports because of padding issue.
  s390/dasd: prevent prefix I/O error
  powerpc/perf: Fix oops when grouping different pmu events
  ipvlan: Add the skb->mark as flow4's member to lookup route
  scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none
  RDMA/cma: Make sure that PSN is not over max allowed
  pinctrl: sunxi: Fix A80 interrupt pin bank
  media: s5k6aa: describe some function parameters
  perf bench numa: Fixup discontiguous/sparse numa nodes
  perf top: Fix window dimensions change handling
  ARM: dts: am4372: Correct the interrupts_properties of McASP
  ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen
  ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function
  ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context
  usb: build drivers/usb/common/ when USB_SUPPORT is set
  usbip: keep usbip_device sockfd state in sync with tcp_socket
  staging: iio: adc: ad7192: fix external frequency setting
  binder: check for binder_thread allocation failure in binder_poll()
  staging: android: ashmem: Fix a race condition in pin ioctls
  dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock
  Make DST_CACHE a silent config option
  arm64: dts: add #cooling-cells to CPU nodes
  video: fbdev/mmp: add MODULE_LICENSE
  ASoC: ux500: add MODULE_LICENSE tag
  net: avoid skb_warn_bad_offload on IS_ERR
  netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert
  netfilter: on sockopt() acquire sock lock only in the required scope
  netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check()
  netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target}
  netfilter: x_tables: fix int overflow in xt_alloc_table_info()
  KVM: x86: fix escape of guest dr6 to the host
  crypto: x86/twofish-3way - Fix %rbp usage
  selinux: skip bounded transition processing if the policy isn't loaded
  selinux: ensure the context is NUL terminated in security_context_to_sid_core()
  Provide a function to create a NUL-terminated string from unterminated data
  drm: Require __GFP_NOFAIL for the legacy drm_modeset_lock_all
  blktrace: fix unlocked registration of tracepoints
  xfrm: check id proto in validate_tmpl()
  xfrm: Fix stack-out-of-bounds read on socket policy lookup.
  mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed.
  cfg80211: check dev_set_name() return value
  net: replace dst_cache ip6_tunnel implementation with the generic one
  net: add dst_cache support
  ANDROID: sdcardfs: Hold i_mutex for i_size_write
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck64-XTS
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck128-XTS
  BACKPORT, FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS
  FROMGIT: crypto: speck - export common helpers
  BACKPORT, FROMGIT: crypto: speck - add support for the Speck block cipher
  UPSTREAM: ANDROID: binder: synchronize_rcu() when using POLLFREE.
  f2fs: updates on v4.16-rc1

Conflicts:
	net/Kconfig
	net/core/Makefile

Change-Id: I659b0444812b04252f1f1fba8bc62410ce42b061
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-03-01 17:20:34 +05:30