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

Commit 251385ba authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'remotes/origin/tmp-bb60f28e' into msm-4.14"

parents c263a40e 4f5d011e

Documentation/device-mapper/thin-provisioning.txt

+5 −3
Original line number Diff line number Diff line
@@ -112,9 +112,11 @@ $low_water_mark is expressed in blocks of size $data_block_size. If 
free space on the data device drops below this level then a dm event

will be triggered which a userspace daemon should catch allowing it to

extend the pool device.  Only one such event will be sent.

Resuming a device with a new table itself triggers an event so the

userspace daemon can use this to detect a situation where a new table

already exceeds the threshold.



No special event is triggered if a just resumed device's free space is below

the low water mark. However, resuming a device always triggers an

event; a userspace daemon should verify that free space exceeds the low

water mark when handling this event.



A low water mark for the metadata device is maintained in the kernel and

will trigger a dm event if free space on the metadata device drops below

Documentation/virtual/kvm/api.txt

+1 −0
Original line number Diff line number Diff line
@@ -1837,6 +1837,7 @@ registers, find a list below: 
  PPC	| KVM_REG_PPC_DBSR              | 32

  PPC   | KVM_REG_PPC_TIDR              | 64

  PPC   | KVM_REG_PPC_PSSCR             | 64

  PPC   | KVM_REG_PPC_DEC_EXPIRY        | 64

  PPC   | KVM_REG_PPC_TM_GPR0           | 64

          ...

  PPC   | KVM_REG_PPC_TM_GPR31          | 64

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 36

SUBLEVEL = 37

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/include/asm/spinlock.h

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock) 
	"	cbnz	%w1, 1f\n"

	"	add	%w1, %w0, %3\n"

	"	casa	%w0, %w1, %2\n"

	"	and	%w1, %w1, #0xffff\n"

	"	eor	%w1, %w1, %w0, lsr #16\n"

	"	sub	%w1, %w1, %3\n"

	"	eor	%w1, %w1, %w0\n"

	"1:")

	: "=&r" (lockval), "=&r" (tmp), "+Q" (*lock)

	: "I" (1 << TICKET_SHIFT)

arch/mips/boot/compressed/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -133,4 +133,8 @@ vmlinuz.srec: vmlinuz 
uzImage.bin: vmlinuz.bin FORCE

	$(call if_changed,uimage,none)



clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}
 
clean-files += $(objtree)/vmlinuz

clean-files += $(objtree)/vmlinuz.32

clean-files += $(objtree)/vmlinuz.ecoff

clean-files += $(objtree)/vmlinuz.bin

clean-files += $(objtree)/vmlinuz.srec