Commit 5f54c8b2 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

This fix was intended for 4.13, but didn't get in because both
maintainers were on vacation.

Paul Mackerras:
 "It adds mutual exclusion between list_add_rcu and list_del_rcu calls
  on the kvm->arch.spapr_tce_tables list.  Without this, userspace could
  potentially trigger corruption of the list and cause a host crash or
  worse."
parents 78809a68 edd03602

Documentation/fb/efifb.txt

+6 −0
Original line number Diff line number Diff line
@@ -27,5 +27,11 @@ You have to add the following kernel parameters in your elilo.conf: 
	Macbook Pro 17", iMac 20" :

		video=efifb:i20



Accepted options:



nowc	Don't map the framebuffer write combined. This can be used

	to workaround side-effects and slowdowns on other CPU cores

	when large amounts of console data are written.



--

Edgar Hucek <gimli@dark-green.com>

Documentation/gpio/gpio-legacy.txt

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ pin controller? 


This is done by registering "ranges" of pins, which are essentially

cross-reference tables. These are described in

Documentation/pinctrl.txt

Documentation/driver-api/pinctl.rst



While the pin allocation is totally managed by the pinctrl subsystem,

gpio (under gpiolib) is still maintained by gpio drivers. It may happen

Documentation/printk-formats.txt

+11 −8
Original line number Diff line number Diff line
@@ -58,20 +58,23 @@ Symbols/Function Pointers 
	%ps	versatile_init

	%pB	prev_fn_of_versatile_init+0x88/0x88



For printing symbols and function pointers. The ``S`` and ``s`` specifiers

result in the symbol name with (``S``) or without (``s``) offsets. Where

this is used on a kernel without KALLSYMS - the symbol address is

printed instead.

The ``F`` and ``f`` specifiers are for printing function pointers,

for example, f->func, &gettimeofday. They have the same result as

``S`` and ``s`` specifiers. But they do an extra conversion on

ia64, ppc64 and parisc64 architectures where the function pointers

are actually function descriptors.



The ``S`` and ``s`` specifiers can be used for printing symbols

from direct addresses, for example, __builtin_return_address(0),

(void *)regs->ip. They result in the symbol name with (``S``) or

without (``s``) offsets. If KALLSYMS are disabled then the symbol

address is printed instead.



The ``B`` specifier results in the symbol name with offsets and should be

used when printing stack backtraces. The specifier takes into

consideration the effect of compiler optimisations which may occur

when tail-call``s are used and marked with the noreturn GCC attribute.



On ia64, ppc64 and parisc64 architectures function pointers are

actually function descriptors which must first be resolved. The ``F`` and

``f`` specifiers perform this resolution and then provide the same

functionality as the ``S`` and ``s`` specifiers.



Kernel Pointers

===============

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ M: Brendan Higgins <brendanhiggins@google.com> 
R:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

R:	Joel Stanley <joel@jms.id.au>

L:	linux-i2c@vger.kernel.org

L:	openbmc@lists.ozlabs.org

L:	openbmc@lists.ozlabs.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/irqchip/irq-aspeed-i2c-ic.c

F:	drivers/i2c/busses/i2c-aspeed.c
@@ -5834,7 +5834,7 @@ F: drivers/staging/greybus/spi.c 
F:	drivers/staging/greybus/spilib.c

F:	drivers/staging/greybus/spilib.h



GREYBUS LOOBACK/TIME PROTOCOLS DRIVERS

GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS

M:	Bryan O'Donoghue <pure.logic@nexus-software.ie>

S:	Maintained

F:	drivers/staging/greybus/loopback.c
@@ -7110,7 +7110,6 @@ M: Marc Zyngier <marc.zyngier@arm.com> 
L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

T:	git git://git.infradead.org/users/jcooper/linux.git irqchip/core

F:	Documentation/devicetree/bindings/interrupt-controller/

F:	drivers/irqchip/
@@ -10398,7 +10397,7 @@ L: linux-gpio@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git

S:	Maintained

F:	Documentation/devicetree/bindings/pinctrl/

F:	Documentation/pinctrl.txt

F:	Documentation/driver-api/pinctl.rst

F:	drivers/pinctrl/

F:	include/linux/pinctrl/
@@ -14019,6 +14018,7 @@ F: drivers/block/virtio_blk.c 
F:	include/linux/virtio*.h

F:	include/uapi/linux/virtio_*.h

F:	drivers/crypto/virtio/

F:	mm/balloon_compaction.c



VIRTIO CRYPTO DRIVER

M:	Gonglei <arei.gonglei@huawei.com>

Makefile

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

PATCHLEVEL = 13

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc6

NAME = Fearless Coyote



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE