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

Commit 177f72fd authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.3-rc2' into for-3.4 

A reasonable amount of new development is causing fiddly merge conflicts
between different resource management changes (mostly fixing bugs in
resource management due to noticing things while doing enhancements in
the same area).

Linux 3.3-rc2

.. several days delayed. No reason, I just didn't think of it.
parents 761bfdd9 62aa2b53

Documentation/DocBook/device-drivers.tmpl

+3 −2
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ 


     <sect1><title>Delaying, scheduling, and timer routines</title>

!Iinclude/linux/sched.h

!Ekernel/sched.c

!Ekernel/sched/core.c

!Ikernel/sched/cpupri.c

!Ikernel/sched/fair.c

!Iinclude/linux/completion.h

!Ekernel/timer.c

     </sect1>
@@ -216,7 +218,6 @@ X!Isound/sound_firmware.c 


  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

  </chapter>

Documentation/DocBook/deviceiobook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags) 
  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Iarch/x86/include/asm/io.h

!Elib/iomap.c

!Elib/pci_iomap.c

  </chapter>



</book>

Documentation/driver-model/devres.txt

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,10 @@ certainly invest a bit more effort into libata core layer). 
  6. List of managed interfaces

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



MEM

  devm_kzalloc()

  devm_kfree()



IO region

  devm_request_region()

  devm_request_mem_region()

Documentation/feature-removal-schedule.txt

+14 −0
Original line number Diff line number Diff line
@@ -510,3 +510,17 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The 
	convert to using pci_scan_root_bus() so they can supply a list of

	bus resources when the bus is created.

Who:	Bjorn Helgaas <bhelgaas@google.com>



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



What:	The CAP9 SoC family will be removed

When:	3.4

Files:	arch/arm/mach-at91/at91cap9.c

	arch/arm/mach-at91/at91cap9_devices.c

	arch/arm/mach-at91/include/mach/at91cap9.h

	arch/arm/mach-at91/include/mach/at91cap9_matrix.h

	arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h

	arch/arm/mach-at91/board-cap9adk.c

Why:	The code is not actively maintained and platforms are now hard to find.

Who:	Nicolas Ferre <nicolas.ferre@atmel.com>

	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Documentation/pinctrl.txt

+8 −9
Original line number Diff line number Diff line
@@ -857,42 +857,41 @@ case), we define a mapping like this: 


...

{

	.name "2bit"

	.name = "2bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_1_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "4bit"

	.name = "4bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_1_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "4bit"

	.name = "4bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_2_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "8bit"

	.name = "8bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_1_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "8bit"

	.name = "8bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_2_grp",

	.dev_name = "foo-mmc.0",

},

{

	.name "8bit"

	.name = "8bit"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "mmc0",

	.group = "mmc0_3_grp",
@@ -995,7 +994,7 @@ This is enabled by simply setting the .hog_on_boot field in the map to true, 
like this:



{

	.name "POWERMAP"

	.name = "POWERMAP"

	.ctrl_dev_name = "pinctrl-foo",

	.function = "power_func",

	.hog_on_boot = true,
@@ -1025,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B: 


foo_switch()

{

	struct pinmux pmx;

	struct pinmux *pmx;



	/* Enable on position A */

	pmx = pinmux_get(&device, "spi0-pos-A");