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

Commit 33260fbf authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.105 (8a539624) into msm-4.4 



* refs/heads/tmp-8a539624
  Linux 4.4.105
  xen-netfront: avoid crashing on resume after a failure in talk_to_netback()
  usb: host: fix incorrect updating of offset
  USB: usbfs: Filter flags passed in from user space
  USB: devio: Prevent integer overflow in proc_do_submiturb()
  USB: Increase usbfs transfer limit
  USB: core: Add type-specific length check of BOS descriptors
  usb: ch9: Add size macro for SSP dev cap descriptor
  usb: Add USB 3.1 Precision time measurement capability descriptor support
  usb: xhci: fix panic in xhci_free_virt_devices_depth_first
  usb: hub: Cycle HUB power when initialization fails
  Revert "ocfs2: should wait dio before inode lock in ocfs2_setattr()"
  net: fec: fix multicast filtering hardware setup
  xen-netfront: Improve error handling during initialization
  mm: avoid returning VM_FAULT_RETRY from ->page_mkwrite handlers
  tcp: correct memory barrier usage in tcp_check_space()
  dmaengine: pl330: fix double lock
  tipc: fix cleanup at module unload
  net: sctp: fix array overrun read on sctp_timer_tbl
  drm/exynos/decon5433: set STANDALONE_UPDATE_F on output enablement
  NFSv4: Fix client recovery when server reboots multiple times
  KVM: arm/arm64: Fix occasional warning from the timer work function
  nfs: Don't take a reference on fl->fl_file for LOCK operation
  ravb: Remove Rx overflow log messages
  net/appletalk: Fix kernel memory disclosure
  vti6: fix device register to report IFLA_INFO_KIND
  ARM: OMAP1: DMA: Correct the number of logical channels
  net: systemport: Pad packet before inserting TSB
  net: systemport: Utilize skb_put_padto()
  kprobes/x86: Disable preemption in ftrace-based jprobes
  perf test attr: Fix ignored test case result
  sysrq : fix Show Regs call trace on ARM
  EDAC, sb_edac: Fix missing break in switch
  x86/entry: Use SYSCALL_DEFINE() macros for sys_modify_ldt()
  serial: 8250: Preserve DLD[7:4] for PORT_XR17V35X
  usb: phy: tahvo: fix error handling in tahvo_usb_probe()
  spi: sh-msiof: Fix DMA transfer size check
  serial: 8250_fintek: Fix rs485 disablement on invalid ioctl()
  selftests/x86/ldt_get: Add a few additional tests for limits
  s390/pci: do not require AIS facility
  ima: fix hash algorithm initialization
  USB: serial: option: add Quectel BG96 id
  s390/runtime instrumentation: simplify task exit handling
  serial: 8250_pci: Add Amazon PCI serial device ID
  usb: quirks: Add no-lpm quirk for KY-688 USB 3.1 Type-C Hub
  uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices
  bcache: recover data from backing when data is clean
  bcache: only permit to recovery read error when cache device is clean
  ANDROID: initramfs: call free_initrd() when skipping init

Conflicts:
	drivers/usb/core/config.c
	include/linux/usb.h
	include/uapi/linux/usb/ch9.h

Change-Id: Ibada5100be12f3a1389461f7738ee2ecb0d427af
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents 80eb7cca 8a539624

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 104

SUBLEVEL = 105

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/mach-omap1/dma.c

+7 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "soc.h"



#define OMAP1_DMA_BASE			(0xfffed800)

#define OMAP1_LOGICAL_DMA_CH_COUNT	17



static u32 enable_1510_mode;
@@ -311,8 +310,6 @@ static int __init omap1_system_dma_init(void) 
		goto exit_iounmap;

	}



	d->lch_count		= OMAP1_LOGICAL_DMA_CH_COUNT;



	/* Valid attributes for omap1 plus processors */

	if (cpu_is_omap15xx())

		d->dev_caps = ENABLE_1510_MODE;
@@ -329,13 +326,14 @@ static int __init omap1_system_dma_init(void) 
	d->dev_caps		|= CLEAR_CSR_ON_READ;

	d->dev_caps		|= IS_WORD_16;



	if (cpu_is_omap15xx())

		d->chan_count = 9;

	else if (cpu_is_omap16xx() || cpu_is_omap7xx()) {

		if (!(d->dev_caps & ENABLE_1510_MODE))

			d->chan_count = 16;

	/* available logical channels */

	if (cpu_is_omap15xx()) {

		d->lch_count = 9;

	} else {

		if (d->dev_caps & ENABLE_1510_MODE)

			d->lch_count = 9;

		else

			d->chan_count = 9;

			d->lch_count = 16;

	}



	p = dma_plat_info;

arch/s390/include/asm/pci_insn.h

+1 −1
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ int zpci_refresh_trans(u64 fn, u64 addr, u64 range); 
int zpci_load(u64 *data, u64 req, u64 offset);

int zpci_store(u64 data, u64 req, u64 offset);

int zpci_store_block(const u64 *data, u64 req, u64 offset);

void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc);

int zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc);



#endif

arch/s390/include/asm/runtime_instr.h

+3 −1
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static inline void restore_ri_cb(struct runtime_instr_cb *cb_next, 
		load_runtime_instr_cb(&runtime_instr_empty_cb);

}



void exit_thread_runtime_instr(void);

struct task_struct;



void runtime_instr_release(struct task_struct *tsk);



#endif /* _RUNTIME_INSTR_H */

arch/s390/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ extern void kernel_thread_starter(void); 
 */

void exit_thread(void)

{

	exit_thread_runtime_instr();

}



void flush_thread(void)
@@ -87,6 +86,7 @@ void arch_release_task_struct(struct task_struct *tsk) 
{

	/* Free either the floating-point or the vector register save area */

	kfree(tsk->thread.fpu.regs);

	runtime_instr_release(tsk);

}



int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)