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

Commit 913146f5 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.14' into msm-3.18 



Linux 3.18.14

Resolve a conflict between the local commit 07c17f4e ("arm64: add
support for NO_KERNEL_MAPPING and STRONGLY_ORDERED") and upstream
a142e964 ("arm64: dma-mapping: always clear allocated buffers")
by moving the memset(addr, 0, size) in __dma_alloc_coherent() to a
point before where the mapping of addr is removed.

Conflicts:
	arch/arm64/mm/dma-mapping.c

Change-Id: I78c4ed3c8f122eba656e3ce0f0471f7287502c56
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 059c7634 51af8176

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3654,6 +3654,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					READ_CAPACITY_16 command);

				f = NO_REPORT_OPCODES (don't use report opcodes

					command, uas only);

				g = MAX_SECTORS_240 (don't transfer more than

					240 sectors at a time, uas only);

				h = CAPACITY_HEURISTICS (decrease the

					reported device capacity by one

					sector if the number is odd);

Documentation/virtual/kvm/api.txt

+11 −1
Original line number Diff line number Diff line
@@ -2455,7 +2455,8 @@ should be created before this ioctl is invoked. 


Possible features:

	- KVM_ARM_VCPU_POWER_OFF: Starts the CPU in a power-off state.

	  Depends on KVM_CAP_ARM_PSCI.

	  Depends on KVM_CAP_ARM_PSCI.  If not set, the CPU will be powered on

	  and execute guest code when KVM_RUN is called.

	- KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode.

	  Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only).

	- KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU.
@@ -2951,6 +2952,15 @@ HVC instruction based PSCI call from the vcpu. The 'type' field describes 
the system-level event type. The 'flags' field describes architecture

specific flags for the system-level event.



Valid values for 'type' are:

  KVM_SYSTEM_EVENT_SHUTDOWN -- the guest has requested a shutdown of the

   VM. Userspace is not obliged to honour this, and if it does honour

   this does not need to destroy the VM synchronously (ie it may call

   KVM_RUN again before shutdown finally occurs).

  KVM_SYSTEM_EVENT_RESET -- the guest has requested a reset of the VM.

   As with SHUTDOWN, userspace can choose to ignore the request, or

   to schedule the reset to occur in the future and may call KVM_RUN again.



		/* Fix the size of the union. */

		char padding[256];

	};

Documentation/virtual/kvm/devices/s390_flic.txt

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ Groups: 
    Copies all floating interrupts into a buffer provided by userspace.

    When the buffer is too small it returns -ENOMEM, which is the indication

    for userspace to try again with a bigger buffer.

    -ENOBUFS is returned when the allocation of a kernelspace buffer has

    failed.

    -EFAULT is returned when copying data to userspace failed.

    All interrupts remain pending, i.e. are not deleted from the list of

    currently pending interrupts.

    attr->addr contains the userspace address of the buffer into which all

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 13

SUBLEVEL = 14

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm/boot/dts/dove.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 


			uart2: serial@12200 {

				compatible = "ns16550a";

				reg = <0x12000 0x100>;

				reg = <0x12200 0x100>;

				reg-shift = <2>;

				interrupts = <9>;

				clocks = <&core_clk 0>;
@@ -163,7 +163,7 @@ 


			uart3: serial@12300 {

				compatible = "ns16550a";

				reg = <0x12100 0x100>;

				reg = <0x12300 0x100>;

				reg-shift = <2>;

				interrupts = <10>;

				clocks = <&core_clk 0>;