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

Commit cabdf6bc authored by Tengfei Fan's avatar Tengfei Fan
Browse files

Merge android-4.9-174 (d47e38b3) into msm-4.9 



* refs/heads/tmp-d47e38b3:
  Linux 4.9.174
  media: v4l2: i2c: ov7670: Fix PLL bypass register values
  x86/mce: Improve error message when kernel cannot recover, p2
  selinux: never allow relabeling on context mounts
  Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
  scsi: RDMA/srpt: Fix a credit leak for aborted commands
  staging: iio: adt7316: fix the dac write calculation
  staging: iio: adt7316: fix the dac read calculation
  staging: iio: adt7316: allow adt751x to use internal vref for all dacs
  perf/x86/amd: Update generic hardware cache events for Family 17h
  ARM: iop: don't use using 64-bit DMA masks
  ARM: orion: don't use using 64-bit DMA masks
  xsysace: Fix error handling in ace_setup
  sh: fix multiple function definition build errors
  hugetlbfs: fix memory leak for resv_map
  net: hns: Fix WARNING when remove HNS driver with SMMU enabled
  net: hns: Use NAPI_POLL_WEIGHT for hns driver
  net: hns: fix KASAN: use-after-free in hns_nic_net_xmit_hw()
  scsi: storvsc: Fix calculation of sub-channel count
  scsi: core: add new RDAC LENOVO/DE_Series device
  vfio/pci: use correct format characters
  rtc: da9063: set uie_unsupported when relevant
  debugfs: fix use-after-free on symlink traversal
  jffs2: fix use-after-free on symlink traversal
  net: stmmac: don't log oversized frames
  net: stmmac: fix dropping of multi-descriptor RX frames
  net: stmmac: don't overwrite discard_frame status
  bonding: show full hw address in sysfs for slave entries
  net/mlx5: E-Switch, Fix esw manager vport indication for more vport commands
  igb: Fix WARN_ONCE on runtime suspend
  batman-adv: Reduce tt_global hash refcnt only for removed entry
  batman-adv: Reduce tt_local hash refcnt only for removed entry
  batman-adv: Reduce claim hash refcnt only for removed entry
  rtc: sh: Fix invalid alarm warning for non-enabled alarm
  HID: debug: fix race condition with between rdesc_show() and device removal
  HID: logitech: check the return value of create_singlethread_workqueue
  nvme-loop: init nvmet_ctrl fatal_err_work when allocate
  USB: core: Fix bug caused by duplicate interface PM usage counter
  USB: core: Fix unterminated string returned by usb_string()
  usb: usbip: fix isoc packet num validation in get_pipe
  USB: w1 ds2490: Fix bug caused by improper use of altsetting array
  USB: yurex: Fix protection fault after device removal
  caif: reduce stack size with KASAN
  arm64: mm: don't print out page table entries on EL0 faults
  arm64: mm: print out correct page table entries
  kasan: prevent compiler from optimizing away memset in tests
  arm64: proc: Set PTE_NG for table entries to avoid traversing them twice
  kasan: remove redundant initialization of variable 'real_size'
  kasan: avoid -Wmaybe-uninitialized warning
  kasan: add a prototype of task_struct to avoid warning
  arm64: kasan: avoid bad virt_to_pfn()
  x86/unwind: Disable KASAN checks for non-current tasks
  mm/kasan: Switch to using __pa_symbol and lm_alias
  x86/suspend: fix false positive KASAN warning on suspend/resume
  net: phy: marvell: Fix buffer overrun with stats counters
  bnxt_en: Improve multicast address setup logic.
  packet: validate msg_namelen in send directly
  ipv6: invert flowlabel sharing check in process and user mode
  ipv6/flowlabel: wait rcu grace period before put_pid()
  ipv4: ip_do_fragment: Preserve skb_iif during fragmentation
  ALSA: line6: use dynamic buffers
  ANDROID: cuttlefish 4.9: enable CONFIG_CRYPTO_AES_NI_INTEL=y

Change-Id: Ic2b4a8e559d993acfce1b5e963949dc297614f3a
Signed-off-by: default avatarTengfei Fan <tengfeif@codeaurora.org>
parents f172415d d47e38b3

Documentation/usb/power-management.txt

+9 −5
Original line number Diff line number Diff line
@@ -365,11 +365,15 @@ autosuspend the interface's device. When the usage counter is = 0 
then the interface is considered to be idle, and the kernel may

autosuspend the device.



Drivers need not be concerned about balancing changes to the usage

counter; the USB core will undo any remaining "get"s when a driver

is unbound from its interface.  As a corollary, drivers must not call

any of the usb_autopm_* functions after their disconnect() routine has

returned.

Drivers must be careful to balance their overall changes to the usage

counter.  Unbalanced "get"s will remain in effect when a driver is

unbound from its interface, preventing the device from going into

runtime suspend should the interface be bound to a driver again.  On

the other hand, drivers are allowed to achieve this balance by calling

the ``usb_autopm_*`` functions even after their ``disconnect`` routine

has returned -- say from within a work-queue routine -- provided they

retain an active reference to the interface (via ``usb_get_intf`` and

``usb_put_intf``).



Drivers using the async routines are responsible for their own

synchronization and mutual exclusion.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 173

SUBLEVEL = 174

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/mach-iop13xx/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = { 
	}

};



static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);

static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);

static struct iop_adma_platform_data iop13xx_adma_0_data = {

	.hw_id = 0,

	.pool_size = PAGE_SIZE,
@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = { 
	.resource = iop13xx_adma_0_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_0_data,

	},

};
@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = { 
	.resource = iop13xx_adma_1_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_1_data,

	},

};
@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = { 
	.resource = iop13xx_adma_2_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_2_data,

	},

};

arch/arm/mach-iop13xx/tpmi.c

+5 −5
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static struct resource iop13xx_tpmi_3_resources[] = { 
	}

};



u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64);

u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32);

static struct platform_device iop13xx_tpmi_0_device = {

	.name = "iop-tpmi",

	.id = 0,
@@ -160,7 +160,7 @@ static struct platform_device iop13xx_tpmi_0_device = { 
	.resource = iop13xx_tpmi_0_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};
@@ -171,7 +171,7 @@ static struct platform_device iop13xx_tpmi_1_device = { 
	.resource = iop13xx_tpmi_1_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};
@@ -182,7 +182,7 @@ static struct platform_device iop13xx_tpmi_2_device = { 
	.resource = iop13xx_tpmi_2_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};
@@ -193,7 +193,7 @@ static struct platform_device iop13xx_tpmi_3_device = { 
	.resource = iop13xx_tpmi_3_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};

arch/arm/plat-iop/adma.c

+3 −3
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = { 
	.resource = iop3xx_dma_0_resources,

	.dev = {

		.dma_mask = &iop3xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop3xx_dma_0_data,

	},

};
@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = { 
	.resource = iop3xx_dma_1_resources,

	.dev = {

		.dma_mask = &iop3xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop3xx_dma_1_data,

	},

};
@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = { 
	.resource = iop3xx_aau_resources,

	.dev = {

		.dma_mask = &iop3xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop3xx_aau_data,

	},

};