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

Commit 65320fce authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

Merge tag 'v3.11-rc7' into stable/for-linus-3.12 



Linux 3.11-rc7

As we need the git commit 28817e9de4f039a1a8c1fe1df2fa2df524626b9e
Author: Chuck Anderson <chuck.anderson@oracle.com>
Date:   Tue Aug 6 15:12:19 2013 -0700

    xen/smp: initialize IPI vectors before marking CPU online

* tag 'v3.11-rc7': (443 commits)
  Linux 3.11-rc7
  ARC: [lib] strchr breakage in Big-endian configuration
  VFS: collect_mounts() should return an ERR_PTR
  bfs: iget_locked() doesn't return an ERR_PTR
  efs: iget_locked() doesn't return an ERR_PTR()
  proc: kill the extra proc_readfd_common()->dir_emit_dots()
  cope with potentially long ->d_dname() output for shmem/hugetlb
  usb: phy: fix build breakage
  USB: OHCI: add missing PCI PM callbacks to ohci-pci.c
  staging: comedi: bug-fix NULL pointer dereference on failed attach
  lib/lz4: correct the LZ4 license
  memcg: get rid of swapaccount leftovers
  nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection
  nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error
  drivers/platform/olpc/olpc-ec.c: initialise earlier
  ipv4: expose IPV4_DEVCONF
  ipv6: handle Redirect ICMP Message with no Redirected Header option
  be2net: fix disabling TX in be_close()
  Revert "ACPI / video: Always call acpi_video_init_brightness() on init"
  Revert "genetlink: fix family dump race"
  ...

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parents c3f31f6a d8dfad38

Documentation/DocBook/media_api.tmpl

+2 −2
Original line number Original line Diff line number Diff line 
<?xml version="1.0"?>

<?xml version="1.0"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
Required properties :

Required properties :





 - reg             : Offset and length of the register set for the device

 - reg             : Offset and length of the register set for the device

 - compatible      : Should be "marvell,mv64xxx-i2c"

 - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"

 - interrupts      : The interrupt number

 - interrupts      : The interrupt number





Optional properties :

Optional properties :

Documentation/devicetree/bindings/regulator/palmas-pmic.txt

+1 −3
Original line number Original line Diff line number Diff line
@@ -31,9 +31,8 @@ Optional nodes: 
	       Optional sub-node properties:

	       Optional sub-node properties:

	       ti,warm-reset - maintain voltage during warm reset(boolean)

	       ti,warm-reset - maintain voltage during warm reset(boolean)

	       ti,roof-floor - control voltage selection by pin(boolean)

	       ti,roof-floor - control voltage selection by pin(boolean)

	       ti,sleep-mode - mode to adopt in pmic sleep 0 - off, 1 - auto,

	       ti,mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - auto,

	       2 - eco, 3 - forced pwm

	       2 - eco, 3 - forced pwm

	       ti,tstep - slope control 0 - Jump, 1 10mV/us, 2 5mV/us, 3 2.5mV/us

	       ti,smps-range - OTP has the wrong range set for the hardware so override

	       ti,smps-range - OTP has the wrong range set for the hardware so override

	       0 - low range, 1 - high range.

	       0 - low range, 1 - high range.
@@ -59,7 +58,6 @@ pmic { 
			ti,warm-reset;

			ti,warm-reset;

			ti,roof-floor;

			ti,roof-floor;

			ti,mode-sleep = <0>;

			ti,mode-sleep = <0>;

			ti,tstep = <0>;

			ti,smps-range = <1>;

			ti,smps-range = <1>;

		};

		};

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

+18 −8
Original line number Original line Diff line number Diff line
@@ -965,6 +965,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

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

S:	Maintained

S:	Maintained





ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

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

S:	Maintained

F:	arch/arm/mach-keystone/



ARM/LOGICPD PXA270 MACHINE SUPPORT

ARM/LOGICPD PXA270 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Lennert Buytenhek <kernel@wantstofly.org>

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

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1259,7 +1265,6 @@ F: drivers/rtc/rtc-coh901331.c 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git





ARM/Ux500 ARM ARCHITECTURE

ARM/Ux500 ARM ARCHITECTURE

M:	Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

M:	Linus Walleij <linus.walleij@linaro.org>

M:	Linus Walleij <linus.walleij@linaro.org>

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

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

S:	Maintained

S:	Maintained
@@ -5576,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/
@@ -5879,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
@@ -5959,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
@@ -7361,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/
@@ -7381,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/
@@ -8664,6 +8669,11 @@ T: git git://git.alsa-project.org/alsa-kernel.git 
S:	Maintained

S:	Maintained

F:	sound/usb/midi.*

F:	sound/usb/midi.*





USB NETWORKING DRIVERS

L:	linux-usb@vger.kernel.org

S:	Odd Fixes

F:	drivers/net/usb/



USB OHCI DRIVER

USB OHCI DRIVER

M:	Alan Stern <stern@rowland.harvard.edu>

M:	Alan Stern <stern@rowland.harvard.edu>

L:	linux-usb@vger.kernel.org

L:	linux-usb@vger.kernel.org