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

Commit 36b22217 authored by Chetan C R's avatar Chetan C R
Browse files

Merge 'android-3.18.115' (6784e569) into 'msm-3.18' 



Merge with google common 'android-3.18.115' at
6784e569 into 'msm-3.18'

* quic/tmp-6784e569:
  Linux 3.18.115
  netfilter: nf_log: don't hold nf_log_mutex during user access
  mtd: cfi_cmdset_0002: Change erase functions to check chip good only
  mtd: cfi_cmdset_0002: Change erase functions to retry for error
  mtd: cfi_cmdset_0002: Change definition naming to retry write operation
  mtd: rawnand: mxc: set spare area size register explicitly
  dm bufio: drop the lock when doing GFP_NOIO allocation
  dm bufio: avoid sleeping while holding the dm_bufio lock
  media: cx25840: Use subdev host data for PLL override
  HID: debug: check length before copy_to_user()
  HID: i2c-hid: Fix "incomplete report" noise
  ext4: add more mount time checks of the superblock
  ext4: clear i_data in ext4_inode_info when removing inline data
  ext4: make sure bitmaps and the inode table don't overlap with bg descriptors
  cifs: Fix infinite loop when using hard mount option
  scsi: sg: mitigate read/write abuse
  net/sonic: Use dma_mapping_error()
  net: qmi_wwan: Add Netgear Aircard 779S
  atm: zatm: fix memcmp casting
  netfilter: ebtables: handle string from userspace with care
  ubi: fastmap: Correctly handle interrupted erasures in EBA
  x86/boot: Fix early command-line parsing when matching at end
  staging: android: ion: Return an ERR_PTR in ion_map_kernel
  n_tty: Fix stall at n_tty_receive_char_special().
  Linux 3.18.114
  dm thin: handle running out of data space vs concurrent discard
  block: Fix transfer when chunk sectors exceeds max
  udf: Detect incorrect directory size
  xen: Remove unnecessary BUG_ON from __unbind_from_irq()
  video: uvesafb: Fix integer overflow in allocation
  nfsd: restrict rd_maxcount to svc_max_payload in nfsd_encode_readdir
  media: dvb_frontend: fix locking issues at dvb_frontend_get_event()
  media: cx231xx: Add support for AverMedia DVD EZMaker 7
  media: v4l2-compat-ioctl32: prevent go past max size
  backlight: tps65217_bl: Fix Device Tree node lookup
  backlight: max8925_bl: Fix Device Tree node lookup
  backlight: as3711_bl: Fix Device Tree node lookup
  UBIFS: Fix potential integer overflow in allocation
  scsi: qla2xxx: Fix setting lower transfer speed if GPSC fails
  time: Make sure jiffies_to_msecs() preserves non-zero time periods
  MIPS: io: Add barrier after register read in inX()
  PCI: pciehp: Clear Presence Detect and Data Link Layer Status Changed on resume
  MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum
  mtd: cfi_cmdset_0002: Avoid walking all chips when unlocking.
  mtd: cfi_cmdset_0002: Fix unlocking requests crossing a chip boudary
  mtd: cfi_cmdset_0002: fix SEGV unlocking multiple chips
  mtd: cfi_cmdset_0002: Use right chip in do_ppb_xxlock()
  mtd: cfi_cmdset_0002: Change write buffer to check correct value
  ARM: 8764/1: kgdb: fix NUMREGBYTES so that gdb_regs[] is the correct size
  powerpc/fadump: Unregister fadump on kexec down path.
  powerpc/ptrace: Fix enforcement of DAWR constraints
  powerpc/ptrace: Fix setting 512B aligned breakpoints with PTRACE_SET_DEBUGREG
  powerpc/mm/hash: Add missing isync prior to kernel stack SLB switch
  fuse: don't keep dead fuse_conn at fuse_fill_super().
  fuse: atomic_o_trunc should truncate pagecache
  ipmi:bt: Set the timeout before doing a capabilities check
  branch-check: fix long->int truncation when profiling branches
  mips: ftrace: fix static function graph tracing
  ASoC: cirrus: i2s: Fix {TX|RX}LinCtrlData setup
  ASoC: cirrus: i2s: Fix LRCLK configuration
  ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it
  signal/xtensa: Consistenly use SIGBUS in do_unaligned_user
  m68k/mm: Adjust VM area to be unmapped by gap size for __iounmap()
  fs/binfmt_misc.c: do not allow offset overflow
  w1: mxc_w1: Enable clock before calling clk_get_rate() on it
  libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk
  libata: zpodd: small read overflow in eject_tray()
  libata: zpodd: make arrays cdb static, reduces object code size
  ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream()
  btrfs: scrub: Don't use inode pages for device replace
  ext4: fix fencepost error in check for inode count overflow during resize
  ext4: update mtime in ext4_punch_hole even if no blocks are released
  tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()
  ARM: 8753/1: decompressor: add a missing parameter to the addruart macro
  ARM: davinci: board-dm646x-evm: set VPIF capture card name
  i2c: viperboard: return message count on master_xfer success
  i2c: pmcmsp: fix error return from master_xfer
  i2c: pmcmsp: return message count on master_xfer success
  ARM: keystone: fix platform_domain_notifier array overrun
  agp: uninorth: make two functions static
  can: dev: increase bus-off message severity
  driver core: add __printf verification to __ata_ehi_pushv_desc
  drm/omap: fix possible NULL ref issue in tiler_reserve_2d
  mac80211: Adjust SAE authentication timeout
  kthread, sched/wait: Fix kthread_parkme() wait-loop
  scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts
  hexagon: export csum_partial_copy_nocheck
  hexagon: add memset_io() helper
  ARM: davinci: board-dm355-evm: fix broken networking
  bpf: fix uninitialized variable in bpf tools
  x86/cpu/intel: Add missing TLB cpuid values
  rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp
  selftests: ftrace: Add a testcase for multiple actions on trigger
  arm64: ptrace: remove addr_limit manipulation
  net: phy: marvell: clear wol event before setting it
  scsi: isci: Fix infinite loop in while loop
  parisc: time: Convert read_persistent_clock() to read_persistent_clock64()
  drm/msm: Fix possible null dereference on failure of get_pages()
  scsi: iscsi: respond to netlink with unicast when appropriate
  isofs: fix potential memory leak in mount option parsing
  s390/smsgiucv: disable SMSG on module unload
  MIPS: io: Add barrier after register read in readX()
  fsnotify: fix ignore mask logic in send_to_group()
  af_key: Always verify length of provided sadb_key
  tools build: Fix Makefile(s) to properly invoke tools build
  tools build: No need to make libapi for perf explicitly
  ANDROID: sdcardfs: fix potential crash when reserved_mb is not zero
  UPSTREAM: of: Add prompt for OF_OVERLAY config
  UPSTREAM: of/overlay: Grammar s/an negative/a negative/
  UPSTREAM: of/overlay: Remove unused variable
  UPSTREAM: of/overlay: Directly include idr.h
  UPSTREAM: of/overlay: Do not generate duplicate nodes
  BACKPORT: of/overlay: Introduce DT overlay support
  UPSTREAM: of: Refactor __of_node_alloc() into __of_node_dup()
  UPSTREAM: of: Use vargs in __of_node_alloc

USB related changes were ignored as per the feedback
from the USB team.

Conflicts:
	drivers/gpu/drm/msm/msm_gem.c
	drivers/of/Kconfig
	drivers/of/Makefile
	drivers/of/overlay.c
	drivers/of/unittest.c
	drivers/usb/core/hub.c

Change-Id: Icdb3a2c919d1ece82626dc406cdb2f9a21a20442
Signed-off-by: default avatarChetan C R <cravin@codeaurora.org>
parents 0f5f44a2 6784e569

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 113

SUBLEVEL = 115

EXTRAVERSION =

NAME = Diseased Newt
@@ -214,7 +214,6 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) 


export srctree objtree VPATH





# SUBARCH tells the usermode build what the underlying arch is.  That is set

# first, and if a usermode build is happening, the "ARCH=um" on the command

# line overrides the setting of ARCH below.  If a native build is happening,
@@ -1523,11 +1522,11 @@ image_name: 
# Clear a bunch of variables before executing the submake

tools/: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/



tools/%: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $*

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/ $*



# Single targets

# ---------------------------------------------------------------------------

arch/arm/boot/compressed/head.S

+8 −8
Original line number Diff line number Diff line
@@ -24,19 +24,19 @@ 
#if defined(CONFIG_DEBUG_ICEDCC)



#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c0, c5, 0

		.endm

#elif defined(CONFIG_CPU_XSCALE)

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c8, c0, 0

		.endm

#else

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c1, c0, 0
@@ -52,7 +52,7 @@ 
		.endm



#if defined(CONFIG_ARCH_SA1100)

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		mov	\rb, #0x80000000	@ physical base address

#ifdef CONFIG_DEBUG_LL_SER3

		add	\rb, \rb, #0x00050000	@ Ser3
@@ -61,8 +61,8 @@ 
#endif

		.endm

#else

		.macro	loadsp,	rb, tmp

		addruart \rb, \tmp

		.macro	loadsp,	rb, tmp1, tmp2

		addruart \rb, \tmp1, \tmp2

		.endm

#endif

#endif
@@ -1223,7 +1223,7 @@ phex: adr r3, phexbuf 
		b	1b



@ puts corrupts {r0, r1, r2, r3}

puts:		loadsp	r3, r1

puts:		loadsp	r3, r2, r1

1:		ldrb	r2, [r0], #1

		teq	r2, #0

		moveq	pc, lr
@@ -1240,8 +1240,8 @@ puts: loadsp r3, r1 
@ putc corrupts {r0, r1, r2, r3}

putc:

		mov	r2, r0

		loadsp	r3, r1, r0

		mov	r0, #0

		loadsp	r3, r1

		b	2b



@ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr}

arch/arm/include/asm/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ extern int kgdb_fault_expected; 


#define KGDB_MAX_NO_CPUS	1

#define BUFMAX			400

#define NUMREGBYTES		(DBG_MAX_REG_NUM << 2)

#define NUMREGBYTES		(GDB_MAX_REGS << 2)

#define NUMCRITREGBYTES		(32 << 2)



#define _R0			0

arch/arm/mach-davinci/board-dm355-evm.c

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/clk.h>

#include <linux/dm9000.h>

#include <linux/videodev2.h>

#include <media/tvp514x.h>

#include <linux/spi/spi.h>
@@ -170,11 +171,16 @@ static struct resource dm355evm_dm9000_rsrc[] = { 
	},

};



static struct dm9000_plat_data dm335evm_dm9000_platdata;



static struct platform_device dm355evm_dm9000 = {

	.name		= "dm9000",

	.id		= -1,

	.resource	= dm355evm_dm9000_rsrc,

	.num_resources	= ARRAY_SIZE(dm355evm_dm9000_rsrc),

	.dev		= {

		.platform_data = &dm335evm_dm9000_platdata,

	},

};



static struct tvp514x_platform_data tvp5146_pdata = {

arch/arm/mach-davinci/board-dm646x-evm.c

+2 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static struct vpif_display_config dm646x_vpif_display_config = { 
		.outputs = dm6467_ch0_outputs,

		.output_count = ARRAY_SIZE(dm6467_ch0_outputs),

	},

	.card_name	= "DM646x EVM",

	.card_name	= "DM646x EVM Video Display",

};



/**
@@ -696,6 +696,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { 
			.fid_pol = 0,

		},

	},

	.card_name = "DM646x EVM Video Capture",

};



static void __init evm_init_video(void)