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

Commit aee2bce3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core 



Pick up the latest upstream fixes.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 5ec4c599 c95389b4

Documentation/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2953,7 +2953,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			improve throughput, but will also increase the

			improve throughput, but will also increase the

			amount of memory reserved for use by the client.

			amount of memory reserved for use by the client.





	swapaccount[=0|1]

	swapaccount=[0|1]

			[KNL] Enable accounting of swap in memory resource

			[KNL] Enable accounting of swap in memory resource

			controller if no parameter or 1 is given or disable

			controller if no parameter or 1 is given or disable

			it if 0 is given (See Documentation/cgroups/memory.txt)

			it if 0 is given (See Documentation/cgroups/memory.txt)

MAINTAINERS

+7 −7
Original line number Original line Diff line number Diff line
@@ -5581,9 +5581,9 @@ S: Maintained 
F:	drivers/media/tuners/mxl5007t.*

F:	drivers/media/tuners/mxl5007t.*





MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

M:	Andrew Gallatin <gallatin@myri.com>

M:	Hyong-Youb Kim <hykim@myri.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://www.myri.com/scs/download-Myri10GE.html

W:	https://www.myricom.com/support/downloads/myri10ge.html

S:	Supported

S:	Supported

F:	drivers/net/ethernet/myricom/myri10ge/

F:	drivers/net/ethernet/myricom/myri10ge/
@@ -5884,7 +5884,7 @@ F: drivers/i2c/busses/i2c-omap.c 
F:	include/linux/i2c-omap.h

F:	include/linux/i2c-omap.h





OMAP DEVICE TREE SUPPORT

OMAP DEVICE TREE SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Tony Lindgren <tony@atomide.com>

M:	Tony Lindgren <tony@atomide.com>

L:	linux-omap@vger.kernel.org

L:	linux-omap@vger.kernel.org

L:	devicetree@vger.kernel.org

L:	devicetree@vger.kernel.org
@@ -5964,14 +5964,14 @@ S: Maintained 
F:	drivers/char/hw_random/omap-rng.c

F:	drivers/char/hw_random/omap-rng.c





OMAP HWMOD SUPPORT

OMAP HWMOD SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Paul Walmsley <paul@pwsan.com>

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.*

F:	arch/arm/mach-omap2/omap_hwmod.*





OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

L:	linux-omap@vger.kernel.org

L:	linux-omap@vger.kernel.org

S:	Maintained

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod_44xx_data.c

F:	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -7366,7 +7366,6 @@ F: drivers/net/ethernet/sfc/ 




SGI GRU DRIVER

SGI GRU DRIVER

M:	Dimitri Sivanich <sivanich@sgi.com>

M:	Dimitri Sivanich <sivanich@sgi.com>

M:	Robin Holt <holt@sgi.com>

S:	Maintained

S:	Maintained

F:	drivers/misc/sgi-gru/

F:	drivers/misc/sgi-gru/
@@ -7386,7 +7385,8 @@ S: Maintained for 2.6. 
F:	Documentation/sgi-visws.txt

F:	Documentation/sgi-visws.txt





SGI XP/XPC/XPNET DRIVER

SGI XP/XPC/XPNET DRIVER

M:	Robin Holt <holt@sgi.com>

M:	Cliff Whickman <cpw@sgi.com>

M:	Robin Holt <robinmholt@gmail.com>

S:	Maintained

S:	Maintained

F:	drivers/misc/sgi-xp/

F:	drivers/misc/sgi-xp/

Makefile

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

VERSION = 3

PATCHLEVEL = 11

PATCHLEVEL = 11

SUBLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc7

NAME = Linux for Workgroups

NAME = Linux for Workgroups





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/Kconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -407,6 +407,12 @@ config CLONE_BACKWARDS2 
	help

	help

	  Architecture has the first two arguments of clone(2) swapped.

	  Architecture has the first two arguments of clone(2) swapped.





config CLONE_BACKWARDS3

	bool

	help

	  Architecture has tls passed as the 3rd argument of clone(2),

	  not the 5th one.



config ODD_RT_SIGACTION

config ODD_RT_SIGACTION

	bool

	bool

	help

	help

arch/arc/lib/strchr-700.S

+10 −0
Original line number Original line Diff line number Diff line
@@ -39,9 +39,18 @@ ARC_ENTRY strchr 
	ld.a	r2,[r0,4]

	ld.a	r2,[r0,4]

	sub	r12,r6,r7

	sub	r12,r6,r7

	bic	r12,r12,r6

	bic	r12,r12,r6

#ifdef __LITTLE_ENDIAN__

	and	r7,r12,r4

	and	r7,r12,r4

	breq	r7,0,.Loop ; For speed, we want this branch to be unaligned.

	breq	r7,0,.Loop ; For speed, we want this branch to be unaligned.

	b	.Lfound_char ; Likewise this one.

	b	.Lfound_char ; Likewise this one.

#else

	and	r12,r12,r4

	breq	r12,0,.Loop ; For speed, we want this branch to be unaligned.

	lsr_s	r12,r12,7

	bic 	r2,r7,r6

	b.d	.Lfound_char_b

	and_s	r2,r2,r12

#endif

; /* We require this code address to be unaligned for speed...  */

; /* We require this code address to be unaligned for speed...  */

.Laligned:

.Laligned:

	ld_s	r2,[r0]

	ld_s	r2,[r0]
@@ -95,6 +104,7 @@ ARC_ENTRY strchr 
	lsr	r7,r7,7

	lsr	r7,r7,7





	bic	r2,r7,r6

	bic	r2,r7,r6

.Lfound_char_b:

	norm	r2,r2

	norm	r2,r2

	sub_s	r0,r0,4

	sub_s	r0,r0,4

	asr_s	r2,r2,3

	asr_s	r2,r2,3