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

Commit c318a821 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.7-rc6 into usb-next 



We want the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 322832f2 a99cde43

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com> 
Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <antoine.tenart@free-electrons.com>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Arnaud Patard <arnaud.patard@rtp-net.org>
@@ -30,6 +31,9 @@ Axel Lin <axel.lin@gmail.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Boris Brezillon <boris.brezillon@free-electrons.com>

Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>

Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Documentation/scsi/scsi_eh.txt

+6 −2
Original line number Diff line number Diff line
@@ -263,19 +263,23 @@ scmd->allowed. 


 3. scmd recovered

    ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd

	- shost->host_failed--

	- clear scmd->eh_eflags

	- scsi_setup_cmd_retry()

	- move from local eh_work_q to local eh_done_q

    LOCKING: none

    CONCURRENCY: at most one thread per separate eh_work_q to

		 keep queue manipulation lockless



 4. EH completes

    ACTION: scsi_eh_flush_done_q() retries scmds or notifies upper

	    layer of failure.

	    layer of failure. May be called concurrently but must have

	    a no more than one thread per separate eh_work_q to

	    manipulate the queue locklessly

	- scmd is removed from eh_done_q and scmd->eh_entry is cleared

	- if retry is necessary, scmd is requeued using

          scsi_queue_insert()

	- otherwise, scsi_finish_command() is invoked for scmd

	- zero shost->host_failed

    LOCKING: queue or finish function performs appropriate locking

MAINTAINERS

+9 −4
Original line number Diff line number Diff line
@@ -595,6 +595,10 @@ S: Odd Fixes 
L:	linux-alpha@vger.kernel.org

F:	arch/alpha/



ALPS PS/2 TOUCHPAD DRIVER

R:	Pali Rohár <pali.rohar@gmail.com>

F:	drivers/input/mouse/alps.*



ALTERA MAILBOX DRIVER

M:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
@@ -2776,9 +2780,9 @@ F: include/net/caif/ 
F:	net/caif/



CALGARY x86-64 IOMMU

M:	Muli Ben-Yehuda <muli@il.ibm.com>

M:	"Jon D. Mason" <jdmason@kudzu.us>

L:	discuss@x86-64.org

M:	Muli Ben-Yehuda <mulix@mulix.org>

M:	Jon Mason <jdmason@kudzu.us>

L:	iommu@lists.linux-foundation.org

S:	Maintained

F:	arch/x86/kernel/pci-calgary_64.c

F:	arch/x86/kernel/tce_64.c
@@ -7420,7 +7424,7 @@ F: drivers/scsi/megaraid.* 
F:	drivers/scsi/megaraid/



MELLANOX ETHERNET DRIVER (mlx4_en)

M: 	Eugenia Emantayev <eugenia@mellanox.com>

M:	Tariq Toukan <tariqt@mellanox.com>

L:	netdev@vger.kernel.org

S:	Supported

W:	http://www.mellanox.com
@@ -8959,6 +8963,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:	drivers/pinctrl/

F:	include/linux/pinctrl/

Makefile

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

PATCHLEVEL = 7

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc6

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*
@@ -363,11 +363,13 @@ CHECK = sparse 


CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void $(CF)

NOSTDINC_FLAGS  =

CFLAGS_MODULE   =

AFLAGS_MODULE   =

LDFLAGS_MODULE  =

CFLAGS_KERNEL	=

AFLAGS_KERNEL	=

LDFLAGS_vmlinux =

CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized

CFLAGS_KCOV	= -fsanitize-coverage=trace-pc

arch/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ config ARCH_INIT_TASK 
config ARCH_TASK_STRUCT_ALLOCATOR

	bool



# Select if arch has its private alloc_thread_info() function

config ARCH_THREAD_INFO_ALLOCATOR

# Select if arch has its private alloc_thread_stack() function

config ARCH_THREAD_STACK_ALLOCATOR

	bool



# Select if arch wants to size task_struct dynamically via arch_task_struct_size: