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

Commit 6c1be3bf authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v3.18.34' into linux-linaro-lsk-v3.18 

 This is the 3.18.34 stable release
parents ada3625e 3b6aa07b

Documentation/devicetree/bindings/ata/ahci-platform.txt

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ Optional properties: 
- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

- ports-implemented : Mask that indicates which ports that the HBA supports

		      are available for software to use. Useful if PORTS_IMPL

		      is not programmed by the BIOS, which is true with

		      some embedded SOC's.



Required properties when using sub-nodes:

- #address-cells    : number of cells to encode an address

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3566,8 +3566,8 @@ F: Documentation/efi-stub.txt 
F:	arch/ia64/kernel/efi.c

F:	arch/x86/boot/compressed/eboot.[ch]

F:	arch/x86/include/asm/efi.h

F:	arch/x86/platform/efi/*

F:	drivers/firmware/efi/*

F:	arch/x86/platform/efi/

F:	drivers/firmware/efi/

F:	include/linux/efi*.h



EFI VARIABLE FILESYSTEM

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 33

SUBLEVEL = 34

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mach-socfpga/headsmp.S

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/memory.h>



	.arch	armv7-a

	.arm



ENTRY(secondary_trampoline)

	/* CPU1 will always fetch from 0x0 when it is brought out of reset.

arch/parisc/kernel/ptrace.c

+11 −5
Original line number Diff line number Diff line
@@ -269,14 +269,19 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 


long do_syscall_trace_enter(struct pt_regs *regs)

{

	long ret = 0;



	/* Do the secure computing check first. */

	secure_computing_strict(regs->gr[20]);



	if (test_thread_flag(TIF_SYSCALL_TRACE) &&

	    tracehook_report_syscall_entry(regs))

		ret = -1L;

	    tracehook_report_syscall_entry(regs)) {

		/*

		 * Tracing decided this syscall should not happen or the

		 * debugger stored an invalid system call number. Skip

		 * the system call and the system call restart handling.

		 */

		regs->gr[20] = -1UL;

		goto out;

	}



#ifdef CONFIG_64BIT

	if (!is_compat_task())
@@ -290,7 +295,8 @@ long do_syscall_trace_enter(struct pt_regs *regs) 
			regs->gr[24] & 0xffffffff,

			regs->gr[23] & 0xffffffff);



	return ret ? : regs->gr[20];

out:

	return regs->gr[20];

}



void do_syscall_trace_exit(struct pt_regs *regs)