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

Commit 78cf4322 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4' 



* refs/heads/tmp-24ac44dc
  Linux 4.4.66
  ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram
  ARCv2: save r30 on kernel entry as gcc uses it for code-gen
  nfsd: check for oversized NFSv2/v3 arguments
  Input: i8042 - add Clevo P650RS to the i8042 reset list
  p9_client_readdir() fix
  MIPS: Avoid BUG warning in arch_check_elf
  MIPS: KGDB: Use kernel context for sleeping threads
  ALSA: seq: Don't break snd_use_lock_sync() loop by timeout
  ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type
  ipv6: check raw payload size correctly in ioctl
  ipv6: check skb->protocol before lookup for nexthop
  macvlan: Fix device ref leak when purging bc_queue
  ip6mr: fix notification device destruction
  netpoll: Check for skb->queue_mapping
  net: ipv6: RTF_PCPU should not be settable from userspace
  dp83640: don't recieve time stamps twice
  tcp: clear saved_syn in tcp_disconnect()
  sctp: listen on the sock only when it's state is listening or closed
  net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given
  l2tp: fix PPP pseudo-wire auto-loading
  l2tp: take reference on sessions being dumped
  net/packet: fix overflow in check for tp_reserve
  net/packet: fix overflow in check for tp_frame_nr
  l2tp: purge socket queues in the .destruct() callback
  net: phy: handle state correctly in phy_stop_machine
  net: neigh: guard against NULL solicit() method
  sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write()
  sparc64: kern_addr_valid regression
  xen/x86: don't lose event interrupts
  usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize
  regulator: core: Clear the supply pointer if enabling fails
  RDS: Fix the atomicity for congestion map update
  net_sched: close another race condition in tcf_mirred_release()
  net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata
  MIPS: Fix crash registers on non-crashing CPUs
  md:raid1: fix a dead loop when read from a WriteMostly disk
  ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()
  drm/amdgpu: fix array out of bounds
  crypto: testmgr - fix out of bound read in __test_aead()
  clk: sunxi: Add apb0 gates for H3
  ARM: OMAP2+: timer: add probe for clocksources
  xc2028: unlock on error in xc2028_set_config()
  f2fs: do more integrity verification for superblock
  net: pppolac/pppopns: Add back the msg_flags

Conflicts:
	drivers/regulator/core.c

Change-Id: I8e7b279efa442a0338ee735d27ff3ebe866a8dee
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 2db428de 24ac44dc

Documentation/devicetree/bindings/clock/sunxi.txt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
	"allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock

	"allwinner,sun4i-a10-axi-clk" - for the AXI clock

	"allwinner,sun8i-a23-axi-clk" - for the AXI clock on A23

	"allwinner,sun4i-a10-gates-clk" - for generic gates on all compatible SoCs

	"allwinner,sun4i-a10-axi-gates-clk" - for the AXI gates

	"allwinner,sun4i-a10-ahb-clk" - for the AHB clock

	"allwinner,sun5i-a13-ahb-clk" - for the AHB clock on A13
@@ -43,6 +44,7 @@ Required properties: 
	"allwinner,sun6i-a31-apb0-gates-clk" - for the APB0 gates on A31

	"allwinner,sun7i-a20-apb0-gates-clk" - for the APB0 gates on A20

	"allwinner,sun8i-a23-apb0-gates-clk" - for the APB0 gates on A23

	"allwinner,sun8i-h3-apb0-gates-clk" - for the APB0 gates on H3

	"allwinner,sun9i-a80-apb0-gates-clk" - for the APB0 gates on A80

	"allwinner,sun4i-a10-apb1-clk" - for the APB1 clock

	"allwinner,sun9i-a80-apb1-clk" - for the APB1 bus clock on A80

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 65

SUBLEVEL = 66

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/include/asm/entry-arcv2.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
	;

	; Now manually save: r12, sp, fp, gp, r25



	PUSH	r30

	PUSH	r12



	; Saving pt_regs->sp correctly requires some extra work due to the way
@@ -72,6 +73,7 @@ 
	POPAX	AUX_USER_SP

1:

	POP	r12

	POP	r30



.endm

arch/arc/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct pt_regs { 
	unsigned long fp;

	unsigned long sp;	/* user/kernel sp depending on where we came from  */



	unsigned long r12;

	unsigned long r12, r30;



	/*------- Below list auto saved by h/w -----------*/

	unsigned long r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11;

arch/arm/mach-omap2/timer.c

+5 −2
Original line number Diff line number Diff line
@@ -496,7 +496,6 @@ void __init omap_init_time(void) 
	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",

			2, "timer_sys_ck", NULL, false);



	if (of_have_populated_dt())

	clocksource_probe();

}
@@ -505,6 +504,8 @@ void __init omap3_secure_sync32k_timer_init(void) 
{

	__omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",

			2, "timer_sys_ck", NULL, false);



	clocksource_probe();

}

#endif /* CONFIG_ARCH_OMAP3 */
@@ -513,6 +514,8 @@ void __init omap3_gptimer_timer_init(void) 
{

	__omap_sync32k_timer_init(2, "timer_sys_ck", NULL,

			1, "timer_sys_ck", "ti,timer-alwon", true);



	clocksource_probe();

}

#endif