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

Commit abb434cb authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2494654d 6350323a

CREDITS

+6 −3
Original line number Diff line number Diff line
@@ -688,10 +688,13 @@ S: Oxfordshire, UK. 


N: Kees Cook

E: kees@outflux.net

W: http://outflux.net/

P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D

D: Minor updates to SCSI types, added /proc/pid/maps protection

E: kees@ubuntu.com

E: keescook@chromium.org

W: http://outflux.net/blog/

P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026

D: Various security things, bug fixes, and documentation.

S: (ask for current address)

S: Portland, Oregon

S: USA



N: Robin Cornelius

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ create_snap 


	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create



rollback_snap



	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback



snap_*



	A directory per each snapshot

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			on: enable for both 32- and 64-bit processes

			off: disable for both 32- and 64-bit processes



	amd_iommu=	[HW,X86-84]

	amd_iommu=	[HW,X86-64]

			Pass parameters to the AMD IOMMU driver in the system.

			Possible values are:

			fullflush - enable flushing of IO/TLB entries when

Documentation/sound/alsa/soc/machine.txt

+2 −4
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ Machine DAI Configuration 
The machine DAI configuration glues all the codec and CPU DAIs together. It can

also be used to set up the DAI system clock and for any machine related DAI

initialisation e.g. the machine audio map can be connected to the codec audio

map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c

for examples.

map, unconnected codec pins can be set as such.



struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
@@ -83,8 +82,7 @@ Machine Power Map 
The machine driver can optionally extend the codec power map and to become an

audio power map of the audio subsystem. This allows for automatic power up/down

of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack

sockets in the machine init function. See soc/pxa/spitz.c and dapm.txt for

details.

sockets in the machine init function.





Machine Controls

MAINTAINERS

+20 −29
Original line number Diff line number Diff line
@@ -511,8 +511,8 @@ M: Joerg Roedel <joerg.roedel@amd.com> 
L:	iommu@lists.linux-foundation.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git

S:	Supported

F:	arch/x86/kernel/amd_iommu*.c

F:	arch/x86/include/asm/amd_iommu*.h

F:	drivers/iommu/amd_iommu*.[ch]

F:	include/linux/amd-iommu.h



AMD MICROCODE UPDATE SUPPORT

M:	Andreas Herrmann <andreas.herrmann3@amd.com>
@@ -1054,35 +1054,18 @@ ARM/SAMSUNG ARM ARCHITECTURES 
M:	Ben Dooks <ben-linux@fluff.org>

M:	Kukjin Kim <kgene.kim@samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/plat-samsung/

F:	arch/arm/plat-s3c24xx/

F:	arch/arm/plat-s5p/

F:	arch/arm/mach-s3c24*/

F:	arch/arm/mach-s3c64xx/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*



ARM/S3C2410 ARM ARCHITECTURE

M:	Ben Dooks <ben-linux@fluff.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c2410/



ARM/S3C244x ARM ARCHITECTURE

M:	Ben Dooks <ben-linux@fluff.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c2440/

F:	arch/arm/mach-s3c2443/



ARM/S3C64xx ARM ARCHITECTURE

M:	Ben Dooks <ben-linux@fluff.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c64xx/

F:	drivers/spi/spi-s3c*

F:	sound/soc/samsung/*



ARM/S5P EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene.kim@samsung.com>
@@ -3118,6 +3101,7 @@ F: include/linux/hid* 


HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS

M:	Thomas Gleixner <tglx@linutronix.de>

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

S:	Maintained

F:	Documentation/timers/

F:	kernel/hrtimer.c
@@ -3627,7 +3611,7 @@ F: net/irda/ 
IRQ SUBSYSTEM

M:	Thomas Gleixner <tglx@linutronix.de>

S:	Maintained

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

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

F:	kernel/irq/



ISAPNP
@@ -4115,7 +4099,7 @@ F: drivers/hwmon/lm90.c 
LOCKDEP AND LOCKSTAT

M:	Peter Zijlstra <peterz@infradead.org>

M:	Ingo Molnar <mingo@redhat.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git

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

S:	Maintained

F:	Documentation/lockdep*.txt

F:	Documentation/lockstat.txt
@@ -4297,7 +4281,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git 
S:	Maintained

F:	Documentation/dvb/

F:	Documentation/video4linux/

F:	Documentation/DocBook/media/

F:	drivers/media/

F:	drivers/staging/media/

F:	include/media/

F:	include/linux/dvb/

F:	include/linux/videodev*.h
@@ -4319,8 +4305,9 @@ F: include/linux/mm.h 
F:	mm/



MEMORY RESOURCE CONTROLLER

M:	Johannes Weiner <hannes@cmpxchg.org>

M:	Michal Hocko <mhocko@suse.cz>

M:	Balbir Singh <bsingharora@gmail.com>

M:	Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>

M:	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

L:	cgroups@vger.kernel.org

L:	linux-mm@kvack.org
@@ -5110,6 +5097,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl> 
M:	Paul Mackerras <paulus@samba.org>

M:	Ingo Molnar <mingo@elte.hu>

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

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

S:	Supported

F:	kernel/events/*

F:	include/linux/perf_event.h
@@ -5189,6 +5177,7 @@ F: drivers/scsi/pm8001/ 


POSIX CLOCKS and TIMERS

M:	Thomas Gleixner <tglx@linutronix.de>

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

S:	Supported

F:	fs/timerfd.c

F:	include/linux/timer*
@@ -5705,6 +5694,7 @@ F: drivers/dma/dw_dmac.c 
TIMEKEEPING, NTP

M:	John Stultz <johnstul@us.ibm.com>

M:	Thomas Gleixner <tglx@linutronix.de>

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

S:	Supported

F:	include/linux/clocksource.h

F:	include/linux/time.h
@@ -5729,6 +5719,7 @@ F: drivers/watchdog/sc1200wdt.c 
SCHEDULER

M:	Ingo Molnar <mingo@elte.hu>

M:	Peter Zijlstra <peterz@infradead.org>

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

S:	Maintained

F:	kernel/sched*

F:	include/linux/sched.h
@@ -6662,7 +6653,7 @@ TRACING 
M:	Steven Rostedt <rostedt@goodmis.org>

M:	Frederic Weisbecker <fweisbec@gmail.com>

M:	Ingo Molnar <mingo@redhat.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core

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

S:	Maintained

F:	Documentation/trace/ftrace.txt

F:	arch/*/*/*/ftrace.h
@@ -7412,7 +7403,7 @@ M: Thomas Gleixner <tglx@linutronix.de> 
M:	Ingo Molnar <mingo@redhat.com>

M:	"H. Peter Anvin" <hpa@zytor.com>

M:	x86@kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git

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

S:	Maintained

F:	Documentation/x86/

F:	arch/x86/