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

Commit 55cfcd12 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'open_state'

parents 35bdb097 75e8c48b

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

MAINTAINERS

+4 −3
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
@@ -10383,7 +10383,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/
@@ -14004,6 +14004,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 = -rc5

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arm/include/asm/tlb.h

+9 −2
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb) 
}



static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

			unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->fullmm = !(start | (end+1));
@@ -166,8 +167,14 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start 
}



static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

			unsigned long start, unsigned long end, bool force)

{

	if (force) {

		tlb->range_start = start;

		tlb->range_end = end;

	}



	tlb_flush_mmu(tlb);



	/* keep the page table cache within bounds */