Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (011e3c63) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/cgroups/memory.txt

+2 −3

Original line number	Diff line number	Diff line
		@@ -34,8 +34,7 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April)

		Features:
		- accounting anonymous pages, file caches, swap caches usage and limiting them.
		- private LRU and reclaim routine. (system's global LRU and private LRU
		work independently from each other)
		- pages are linked to per-memcg LRU exclusively, and there is no global LRU.
		- optionally, memory+swap usage can be accounted and limited.
		- hierarchical accounting
		- soft limit
		@@ -154,7 +153,7 @@ updated. page_cgroup has its own LRU on cgroup.
		2.2.1 Accounting details

		All mapped anon pages (RSS) and cache pages (Page Cache) are accounted.
		Some pages which are never reclaimable and will not be on the global LRU
		Some pages which are never reclaimable and will not be on the LRU
		are not accounted. We just account pages under usual VM management.

		RSS pages are accounted at page_fault unless they've already been accounted

Documentation/filesystems/vfs.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ members are defined:
		struct file_system_type {
		const char *name;
		int fs_flags;
		struct dentry (mount) (struct file_system_type , int,
		struct dentry (mount) (struct file_system_type *, int,
		const char , void );
		void (kill_sb) (struct super_block );
		struct module *owner;

MAINTAINERS

+24 −20

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ M: Len Brown <lenb@kernel.org>
		L: linux-acpi@vger.kernel.org
		W: http://www.lesswatts.org/projects/acpi/
		Q: http://patchwork.kernel.org/project/linux-acpi/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
		S: Supported
		F: drivers/acpi/
		F: drivers/pnp/pnpacpi/
		@@ -1522,8 +1522,8 @@ M: Gustavo Padovan <gustavo@padovan.org>
		M: Johan Hedberg <johan.hedberg@gmail.com>
		L: linux-bluetooth@vger.kernel.org
		W: http://www.bluez.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
		S: Maintained
		F: drivers/bluetooth/

		@@ -1533,8 +1533,8 @@ M: Gustavo Padovan <gustavo@padovan.org>
		M: Johan Hedberg <johan.hedberg@gmail.com>
		L: linux-bluetooth@vger.kernel.org
		W: http://www.bluez.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
		S: Maintained
		F: net/bluetooth/
		F: include/net/bluetooth/
		@@ -2451,17 +2451,17 @@ F: fs/ecryptfs/

		EDAC-CORE
		M: Doug Thompson <dougthompson@xmission.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Supported
		F: Documentation/edac.txt
		F: drivers/edac/edac_*
		F: drivers/edac/
		F: include/linux/edac.h

		EDAC-AMD64
		M: Doug Thompson <dougthompson@xmission.com>
		M: Borislav Petkov <borislav.petkov@amd.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Supported
		F: drivers/edac/amd64_edac*
		@@ -2469,35 +2469,35 @@ F: drivers/edac/amd64_edac*
		EDAC-E752X
		M: Mark Gross <mark.gross@intel.com>
		M: Doug Thompson <dougthompson@xmission.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/e752x_edac.c

		EDAC-E7XXX
		M: Doug Thompson <dougthompson@xmission.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/e7xxx_edac.c

		EDAC-I82443BXGX
		M: Tim Small <tim@buttersideup.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i82443bxgx_edac.c

		EDAC-I3000
		M: Jason Uhlenkott <juhlenko@akamai.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i3000_edac.c

		EDAC-I5000
		M: Doug Thompson <dougthompson@xmission.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i5000_edac.c
		@@ -2526,21 +2526,21 @@ F: drivers/edac/i7core_edac.c
		EDAC-I82975X
		M: Ranganathan Desikan <ravi@jetztechnologies.com>
		M: "Arvind R." <arvino55@gmail.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i82975x_edac.c

		EDAC-PASEMI
		M: Egor Martovetsky <egor@pasemi.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/pasemi_edac.c

		EDAC-R82600
		M: Tim Small <tim@buttersideup.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/r82600_edac.c
		@@ -4528,8 +4528,7 @@ S: Supported
		F: drivers/net/ethernet/myricom/myri10ge/

		NATSEMI ETHERNET DRIVER (DP8381x)
		M: Tim Hockin <thockin@hockin.org>
		S: Maintained
		S: Orphan
		F: drivers/net/ethernet/natsemi/natsemi.c

		NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
		@@ -4798,6 +4797,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
		F: arch/arm/mach-omap2/clockdomain44xx.c

		OMAP AUDIO SUPPORT
		M: Peter Ujfalusi <peter.ujfalusi@ti.com>
		M: Jarkko Nikula <jarkko.nikula@bitmer.com>
		L: alsa-devel@alsa-project.org (subscribers-only)
		L: linux-omap@vger.kernel.org
		@@ -5112,6 +5112,11 @@ F: drivers/i2c/busses/i2c-pca-*
		F: include/linux/i2c-algo-pca.h
		F: include/linux/i2c-pca-platform.h

		PCDP - PRIMARY CONSOLE AND DEBUG PORT
		M: Khalid Aziz <khalid.aziz@hp.com>
		S: Maintained
		F: drivers/firmware/pcdp.*

		PCI ERROR RECOVERY
		M: Linas Vepstas <linasvepstas@gmail.com>
		L: linux-pci@vger.kernel.org
		@@ -7456,8 +7461,7 @@ F: include/linux/wm97xx.h

		WOLFSON MICROELECTRONICS DRIVERS
		M: Mark Brown <broonie@opensource.wolfsonmicro.com>
		M: Ian Lartey <ian@opensource.wolfsonmicro.com>
		M: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
		L: patches@opensource.wolfsonmicro.com
		T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc
		T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
		W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 4
		SUBLEVEL = 0
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Saber-toothed Squirrel

		# DOCUMENTATION

arch/c6x/include/asm/irq.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -42,10 +42,6 @@
		/* This number is used when no interrupt has been assigned */
		#define NO_IRQ 0

		struct irq_data;
		extern irq_hw_number_t irqd_to_hwirq(struct irq_data *d);
		extern irq_hw_number_t virq_to_hw(unsigned int virq);

		extern void __init init_pic_c64xplus(void);

		extern void init_IRQ(void);