Merge commit 'origin/master' into next (1e43bee9) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/filesystems/ocfs2.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,15 +20,16 @@ Lots of code taken from ext3 and other projects.
		Authors in alphabetical order:
		Joel Becker <joel.becker@oracle.com>
		Zach Brown <zach.brown@oracle.com>
		Mark Fasheh <mark.fasheh@oracle.com>
		Mark Fasheh <mfasheh@suse.com>
		Kurt Hackel <kurt.hackel@oracle.com>
		Tao Ma <tao.ma@oracle.com>
		Sunil Mushran <sunil.mushran@oracle.com>
		Manish Singh <manish.singh@oracle.com>
		Tiger Yang <tiger.yang@oracle.com>

		Caveats
		=======
		Features which OCFS2 does not support yet:
		- quotas
		- Directory change notification (F_NOTIFY)
		- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)

		@@ -70,7 +71,6 @@ commit=nrsec (*) Ocfs2 can be told to sync all its data and metadata
		performance.
		localalloc=8(*) Allows custom localalloc size in MB. If the value is too
		large, the fs will silently revert it to the default.
		Localalloc is not enabled for local mounts.
		localflocks This disables cluster aware flock.
		inode64 Indicates that Ocfs2 is allowed to create inodes at
		any location in the filesystem, including those which

Documentation/vm/page-types.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ static void fatal(const char *x, ...)
		exit(EXIT_FAILURE);
		}

		int checked_open(const char *pathname, int flags)
		static int checked_open(const char *pathname, int flags)
		{
		int fd = open(pathname, flags);

MAINTAINERS

+27 −24

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ M: Ron Minnich <rminnich@sandia.gov>
		M: Latchesar Ionkov <lucho@ionkov.net>
		L: v9fs-developer@lists.sourceforge.net
		W: http://swik.net/v9fs
		T: git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
		S: Maintained
		F: Documentation/filesystems/9p.txt
		F: fs/9p/
		@@ -906,7 +906,6 @@ M: Karol Kozimor <sziwan@users.sourceforge.net>
		L: acpi4asus-user@lists.sourceforge.net
		W: http://acpi4asus.sf.net
		S: Maintained
		F: arch/x86/kernel/acpi/boot.c
		F: drivers/platform/x86/asus_acpi.c

		ASUS ASB100 HARDWARE MONITOR DRIVER
		@@ -1245,8 +1244,7 @@ S: Supported
		F: drivers/net/tg3.*

		BROCADE BFA FC SCSI DRIVER
		P: Jing Huang
		M: huangj@brocade.com
		M: Jing Huang <huangj@brocade.com>
		L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/bfa/
		@@ -2825,7 +2823,7 @@ F: drivers/infiniband/hw/ipath/

		IPMI SUBSYSTEM
		M: Corey Minyard <minyard@acm.org>
		L: openipmi-developer@lists.sourceforge.net
		L: openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
		W: http://openipmi.sourceforge.net/
		S: Supported
		F: Documentation/IPMI.txt
		@@ -3086,9 +3084,13 @@ F: kernel/kgdb.c

		KMEMCHECK
		M: Vegard Nossum <vegardno@ifi.uio.no>
		P Pekka Enberg
		M: penberg@cs.helsinki.fi
		M: Pekka Enberg <penberg@cs.helsinki.fi>
		S: Maintained
		F: Documentation/kmemcheck.txt
		F: arch/x86/include/asm/kmemcheck.h
		F: arch/x86/mm/kmemcheck/
		F: include/linux/kmemcheck.h
		F: mm/kmemcheck.c

		KMEMLEAK
		M: Catalin Marinas <catalin.marinas@arm.com>
		@@ -3618,7 +3620,7 @@ L: netfilter@vger.kernel.org
		L: coreteam@netfilter.org
		W: http://www.netfilter.org/
		W: http://www.iptables.org/
		T: git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
		S: Supported
		F: include/linux/netfilter*
		F: include/linux/netfilter/
		@@ -4330,6 +4332,8 @@ F: drivers/video/aty/aty128fb.c

		RALINK RT2X00 WIRELESS LAN DRIVER
		P: rt2x00 project
		M: Ivo van Doorn <IvDoorn@gmail.com>
		M: Gertjan van Wingerde <gwingerde@gmail.com>
		L: linux-wireless@vger.kernel.org
		L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)
		W: http://rt2x00.serialmonkey.com/
		@@ -4417,7 +4421,7 @@ RFKILL
		M: Johannes Berg <johannes@sipsolutions.net>
		L: linux-wireless@vger.kernel.org
		S: Maintained
		F Documentation/rfkill.txt
		F: Documentation/rfkill.txt
		F: net/rfkill/

		RISCOM8 DRIVER
		@@ -4637,7 +4641,7 @@ F: drivers/mmc/host/sdhci-s3c.c
		SECURITY SUBSYSTEM
		M: James Morris <jmorris@namei.org>
		L: linux-security-module@vger.kernel.org (suggested Cc:)
		T: git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
		W: http://security.wiki.kernel.org/
		S: Supported
		F: security/
		@@ -4673,8 +4677,7 @@ F: include/linux/ata.h
		F: include/linux/libata.h

		SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
		P: Jayamohan Kallickal
		M: jayamohank@serverengines.com
		M: Jayamohan Kallickal <jayamohank@serverengines.com>
		L: linux-scsi@vger.kernel.org
		W: http://www.serverengines.com
		S: Supported
		@@ -5685,7 +5688,7 @@ F: include/linux/vlynq.h

		VMWARE VMXNET3 ETHERNET DRIVER
		M: Shreyas Bhatewara <sbhatewara@vmware.com>
		M: VMware, Inc. <pv-drivers@vmware.com>
		M: "VMware, Inc." <pv-drivers@vmware.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/vmxnet3/

Makefile

+2 −2

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 32
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc8
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION
		@@ -221,7 +221,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \

		HOSTCC = gcc
		HOSTCXX = g++
		HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
		HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
		HOSTCXXFLAGS = -O2

		# Decide whether to build built-in, modular, or both.

arch/alpha/boot/tools/objstrip.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		const char * prog_name;


		void
		static void
		usage (void)
		{
		fprintf(stderr,