Merge branch 'linus' into perf/core (b226f744) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/debugging-via-ohci1394.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -64,14 +64,14 @@ be used to view the printk buffer of a remote machine, even with live update.

		Bernhard Kaindl enhanced firescope to support accessing 64-bit machines
		from 32-bit firescope and vice versa:
		- ftp://ftp.suse.de/private/bk/firewire/tools/firescope-0.2.2.tar.bz2
		- http://halobates.de/firewire/firescope-0.2.2.tar.bz2

		and he implemented fast system dump (alpha version - read README.txt):
		- ftp://ftp.suse.de/private/bk/firewire/tools/firedump-0.1.tar.bz2
		- http://halobates.de/firewire/firedump-0.1.tar.bz2

		There is also a gdb proxy for firewire which allows to use gdb to access
		data which can be referenced from symbols found by gdb in vmlinux:
		- ftp://ftp.suse.de/private/bk/firewire/tools/fireproxy-0.33.tar.bz2
		- http://halobates.de/firewire/fireproxy-0.33.tar.bz2

		The latest version of this gdb proxy (fireproxy-0.34) can communicate (not
		yet stable) with kgdb over an memory-based communication module (kgdbom).
		@@ -178,7 +178,7 @@ Step-by-step instructions for using firescope with early OHCI initialization:

		Notes
		-----
		Documentation and specifications: ftp://ftp.suse.de/private/bk/firewire/docs
		Documentation and specifications: http://halobates.de/firewire/

		FireWire is a trademark of Apple Inc. - for more information please refer to:
		http://en.wikipedia.org/wiki/FireWire

Documentation/feature-removal-schedule.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -451,3 +451,33 @@ Why: OSS sound_core grabs all legacy minors (0-255) of SOUND_MAJOR
		will also allow making ALSA OSS emulation independent of
		sound_core. The dependency will be broken then too.
		Who: Tejun Heo <tj@kernel.org>

		----------------------------

		What: Support for VMware's guest paravirtuliazation technique [VMI] will be
		dropped.
		When: 2.6.37 or earlier.
		Why: With the recent innovations in CPU hardware acceleration technologies
		from Intel and AMD, VMware ran a few experiments to compare these
		techniques to guest paravirtualization technique on VMware's platform.
		These hardware assisted virtualization techniques have outperformed the
		performance benefits provided by VMI in most of the workloads. VMware
		expects that these hardware features will be ubiquitous in a couple of
		years, as a result, VMware has started a phased retirement of this
		feature from the hypervisor. We will be removing this feature from the
		Kernel too. Right now we are targeting 2.6.37 but can retire earlier if
		technical reasons (read opportunity to remove major chunk of pvops)
		arise.

		Please note that VMI has always been an optimization and non-VMI kernels
		still work fine on VMware's platform.
		Latest versions of VMware's product which support VMI are,
		Workstation 7.0 and VSphere 4.0 on ESX side, future maintainence
		releases for these products will continue supporting VMI.

		For more details about VMI retirement take a look at this,
		http://blogs.vmware.com/guestosguide/2009/09/vmi-retirement.html

		Who: Alok N Kataria <akataria@vmware.com>

		----------------------------

Documentation/filesystems/ext3.txt

+12 −4

Original line number	Diff line number	Diff line
		@@ -123,10 +123,18 @@ resuid=n The user ID which may use the reserved blocks.

		sb=n Use alternate superblock at this location.

		quota
		noquota
		grpquota
		usrquota
		quota These options are ignored by the filesystem. They
		noquota are used only by quota tools to recognize volumes
		grpquota where quota should be turned on. See documentation
		usrquota in the quota-tools package for more details
		(http://sourceforge.net/projects/linuxquota).

		jqfmt=<quota type> These options tell filesystem details about quota
		usrjquota=<file> so that quota information can be properly updated
		grpjquota=<file> during journal replay. They replace the above
		quota options. See documentation in the quota-tools
		package for more details
		(http://sourceforge.net/projects/linuxquota).

		bh (*) ext3 associates buffer heads to data pages to
		nobh (a) cache disk block mapping information

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -359,6 +359,7 @@ STAC9227/9228/9229/927x
		5stack-no-fp D965 5stack without front panel
		dell-3stack Dell Dimension E520
		dell-bios Fixes with Dell BIOS setup
		volknob Fixes with volume-knob widget 0x24
		auto BIOS setup (default)

		STAC92HD71B*

MAINTAINERS

+13 −0

Original line number	Diff line number	Diff line
		@@ -577,6 +577,11 @@ M: Mike Rapoport <mike@compulab.co.il>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained

		ARM/CONTEC MICRO9 MACHINE SUPPORT
		M: Hubert Feurstein <hubert.feurstein@contec.at>
		S: Maintained
		F: arch/arm/mach-ep93xx/micro9.c

		ARM/CORGI MACHINE SUPPORT
		M: Richard Purdie <rpurdie@rpsys.net>
		S: Maintained
		@@ -2610,6 +2615,7 @@ L: linux1394-devel@lists.sourceforge.net
		W: http://www.linux1394.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
		S: Maintained
		F: Documentation/debugging-via-ohci1394.txt
		F: drivers/ieee1394/

		IEEE 1394 RAW I/O DRIVER
		@@ -4071,6 +4077,13 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl>
		M: Paul Mackerras <paulus@samba.org>
		M: Ingo Molnar <mingo@elte.hu>
		S: Supported
		F: kernel/perf_event.c
		F: include/linux/perf_event.h
		F: arch///kernel/perf_event.c
		F: arch/*/include/asm/perf_event.h
		F: arch/*/lib/perf_event.c
		F: arch/*/kernel/perf_callchain.c
		F: tools/perf/

		PERSONALITY HANDLING
		M: Christoph Hellwig <hch@infradead.org>