Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f34d8ef8 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.14.169 (239034f0) into msm-4.14 



* refs/heads/tmp-239034f0:
  Linux 4.14.169
  net/x25: fix nonblocking connect
  netfilter: ipset: use bitmap infrastructure completely
  bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free()
  md: Avoid namespace collision with bitmap API
  scsi: iscsi: Avoid potential deadlock in iscsi_if_rx func
  media: v4l2-ioctl.c: zero reserved fields for S/TRY_FMT
  libertas: Fix two buffer overflows at parsing bss descriptor
  coresight: tmc-etf: Do not call smp_processor_id from preemptible
  coresight: etb10: Do not call smp_processor_id from preemptible
  sd: Fix REQ_OP_ZONE_REPORT completion handling
  do_last(): fetch directory ->i_mode and ->i_uid before it's too late
  tracing: xen: Ordered comparison of function pointers
  scsi: RDMA/isert: Fix a recently introduced regression related to logout
  hwmon: (nct7802) Fix voltage limits to wrong registers
  Input: sun4i-ts - add a check for devm_thermal_zone_of_sensor_register
  Input: pegasus_notetaker - fix endpoint sanity check
  Input: aiptek - fix endpoint sanity check
  Input: gtco - fix endpoint sanity check
  Input: sur40 - fix interface sanity checks
  Input: pm8xxx-vib - fix handling of separate enable register
  Documentation: Document arm64 kpti control
  mmc: sdhci: fix minimum clock rate for v3 controller
  mmc: tegra: fix SDR50 tuning override
  ARM: 8950/1: ftrace/recordmcount: filter relocation types
  Revert "Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers"
  Input: keyspan-remote - fix control-message timeouts
  hwmon: (core) Do not use device managed functions for memory allocations
  hwmon: (core) Fix double-free in __hwmon_device_register()
  hwmon: Deal with errors from the thermal subsystem
  hwmon: (adt7475) Make volt2reg return same reg as reg2volt input
  net: rtnetlink: validate IFLA_MTU attribute in rtnl_create_link()
  tcp_bbr: improve arithmetic division in bbr_update_bw()
  net: usb: lan78xx: Add .ndo_features_check
  net-sysfs: Fix reference count leak
  net-sysfs: Call dev_hold always in rx_queue_add_kobject
  net-sysfs: Call dev_hold always in netdev_queue_add_kobject
  net-sysfs: fix netdev_queue_add_kobject() breakage
  net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject
  net_sched: fix datalen for ematch
  net, ip_tunnel: fix namespaces move
  net, ip6_tunnel: fix namespaces move
  net: cxgb3_main: Add CAP_NET_ADMIN check to CHELSIO_GET_MEM
  ipv6: sr: remove SKB_GSO_IPXIP6 on End.D* actions
  gtp: make sure only SOCK_DGRAM UDP sockets are accepted
  firestream: fix memory leaks
  can, slip: Protect tty->disc_data in write_wakeup and close with RCU
  UPSTREAM: staging: most: net: fix buffer overflow
  ANDROID: Fixing incremental fs style issues
  ANDROID: Make incfs selftests pass
  ANDROID: Initial commit of Incremental FS
  ANDROID: cuttlefish_defconfig: Enable CONFIG_BTT

 New header file entries are added to .bp files.

Change-Id: I521b976a19c8993b0047ab06e6d42b5107c234a3
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 8e1e2984 239034f0

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1867,6 +1867,12 @@ 
			Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y,

			the default is off.



	kpti=		[ARM64] Control page table isolation of user

			and kernel address spaces.

			Default: enabled on cores which need mitigation.

			0: force disabled

			1: force enabled



	kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.

			Default is 0 (don't ignore, but inject #GP)

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 168

SUBLEVEL = 169

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/configs/cuttlefish_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ CONFIG_ANDROID=y 
CONFIG_ANDROID_BINDER_IPC=y

CONFIG_LIBNVDIMM=y

# CONFIG_ND_BLK is not set

# CONFIG_BTT is not set

CONFIG_ARM_SCPI_PROTOCOL=y

# CONFIG_ARM_SCPI_POWER_DOMAIN is not set

CONFIG_EXT4_FS=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ CONFIG_ANDROID=y 
CONFIG_ANDROID_BINDER_IPC=y

CONFIG_LIBNVDIMM=y

# CONFIG_ND_BLK is not set

# CONFIG_BTT is not set

# CONFIG_FIRMWARE_MEMMAP is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

drivers/atm/firestream.c

+3 −0
Original line number Diff line number Diff line
@@ -927,6 +927,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
			}

			if (!to) {

				printk ("No more free channels for FS50..\n");

				kfree(vcc);

				return -EBUSY;

			}

			vcc->channo = dev->channo;
@@ -937,6 +938,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
			if (((DO_DIRECTION(rxtp) && dev->atm_vccs[vcc->channo])) ||

			    ( DO_DIRECTION(txtp) && test_bit (vcc->channo, dev->tx_inuse))) {

				printk ("Channel is in use for FS155.\n");

				kfree(vcc);

				return -EBUSY;

			}

		}
@@ -950,6 +952,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
			    tc, sizeof (struct fs_transmit_config));

		if (!tc) {

			fs_dprintk (FS_DEBUG_OPEN, "fs: can't alloc transmit_config.\n");

			kfree(vcc);

			return -ENOMEM;

		}