Commit 2ae33b38 authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

Merge remote-tracking branch 'upstream/master' into queue 



Merge reason:

From: Alexander Graf <agraf@suse.de>

"Just recently this really important patch got pulled into Linus' tree for 3.9:

commit 1674400a
Author: Anton Blanchard <anton <at> samba.org>
Date:   Tue Mar 12 01:51:51 2013 +0000

Without that commit, I can not boot my G5, thus I can't run automated tests on it against my queue.

Could you please merge kvm/next against linus/master, so that I can base my trees against that?"

* upstream/master: (653 commits)
  PCI: Use ROM images from firmware only if no other ROM source available
  sparc: remove unused "config BITS"
  sparc: delete "if !ULTRA_HAS_POPULATION_COUNT"
  KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798)
  KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797)
  KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796)
  arm64: Kconfig.debug: Remove unused CONFIG_DEBUG_ERRORS
  arm64: Do not select GENERIC_HARDIRQS_NO_DEPRECATED
  inet: limit length of fragment queue hash table bucket lists
  qeth: Fix scatter-gather regression
  qeth: Fix invalid router settings handling
  qeth: delay feature trace
  sgy-cts1000: Remove __dev* attributes
  KVM: x86: fix deadlock in clock-in-progress request handling
  KVM: allow host header to be included even for !CONFIG_KVM
  hwmon: (lm75) Fix tcn75 prefix
  hwmon: (lm75.h) Update header inclusion
  MAINTAINERS: Remove Mark M. Hoffman
  xfs: ensure we capture IO errors correctly
  xfs: fix xfs_iomap_eof_prealloc_initial_size type
  ...

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parents 04b66839 2ffdd7e2

CREDITS

+11 −3
Original line number Diff line number Diff line
@@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061 
S: USA



N: Randy Dunlap

E: rdunlap@xenotime.net

W: http://www.xenotime.net/linux/linux.html

W: http://www.linux-usb.org

E: rdunlap@infradead.org

W: http://www.infradead.org/~rdunlap/

D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers

D: x86 SMP, ACPI, bootflag hacking

D: documentation, builds

S: (ask for current address)

S: USA
@@ -1510,6 +1510,14 @@ D: Natsemi ethernet 
D: Cobalt Networks (x86) support

D: This-and-That



N: Mark M. Hoffman

E: mhoffman@lightlink.com

D: asb100, lm93 and smsc47b397 hardware monitoring drivers

D: hwmon subsystem core

D: hwmon subsystem maintainer

D: i2c-sis96x and i2c-stub SMBus drivers

S: USA



N: Dirk Hohndel

E: hohndel@suse.de

D: The XFree86[tm] Project

Documentation/SubmittingPatches

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ own source tree. For example: 
"dontdiff" is a list of files which are generated by the kernel during

the build process, and should be ignored in any diff(1)-generated

patch.  The "dontdiff" file is included in the kernel tree in

2.6.12 and later.  For earlier kernel versions, you can get it

from <http://www.xenotime.net/linux/doc/dontdiff>.

2.6.12 and later.



Make sure your patch does not include any extra files which do not

belong in a patch submission.  Make sure to review your patch -after-

Documentation/device-mapper/dm-raid.txt

+37 −7
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ The target is named "raid" and it accepts the following parameters: 
  raid10        Various RAID10 inspired algorithms chosen by additional params

		- RAID10: Striped Mirrors (aka 'Striping on top of mirrors')

		- RAID1E: Integrated Adjacent Stripe Mirroring

		- RAID1E: Integrated Offset Stripe Mirroring

		-  and other similar RAID10 variants



  Reference: Chapter 4 of
@@ -64,15 +65,15 @@ The target is named "raid" and it accepts the following parameters: 
		synchronisation state for each region.



        [raid10_copies   <# copies>]

        [raid10_format   near]

        [raid10_format   <near|far|offset>]

		These two options are used to alter the default layout of

		a RAID10 configuration.  The number of copies is can be

		specified, but the default is 2.  There are other variations

		to how the copies are laid down - the default and only current

		option is "near".  Near copies are what most people think of

		with respect to mirroring.  If these options are left

		unspecified, or 'raid10_copies 2' and/or 'raid10_format near'

		are given, then the layouts for 2, 3 and 4 devices are:

		specified, but the default is 2.  There are also three

		variations to how the copies are laid down - the default

		is "near".  Near copies are what most people think of with

		respect to mirroring.  If these options are left unspecified,

		or 'raid10_copies 2' and/or 'raid10_format near' are given,

		then the layouts for 2, 3 and 4 devices	are:

		2 drives         3 drives          4 drives

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

		A1  A1           A1  A1  A2        A1  A1  A2  A2
@@ -85,6 +86,33 @@ The target is named "raid" and it accepts the following parameters: 
		3-device layout is what might be called a 'RAID1E - Integrated

		Adjacent Stripe Mirroring'.



		If 'raid10_copies 2' and 'raid10_format far', then the layouts

		for 2, 3 and 4 devices are:

		2 drives             3 drives             4 drives

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

		A1  A2               A1   A2   A3         A1   A2   A3   A4

		A3  A4               A4   A5   A6         A5   A6   A7   A8

		A5  A6               A7   A8   A9         A9   A10  A11  A12

		..  ..               ..   ..   ..         ..   ..   ..   ..

		A2  A1               A3   A1   A2         A2   A1   A4   A3

		A4  A3               A6   A4   A5         A6   A5   A8   A7

		A6  A5               A9   A7   A8         A10  A9   A12  A11

		..  ..               ..   ..   ..         ..   ..   ..   ..



		If 'raid10_copies 2' and 'raid10_format offset', then the

		layouts for 2, 3 and 4 devices are:

		2 drives       3 drives           4 drives

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

		A1  A2         A1  A2  A3         A1  A2  A3  A4

		A2  A1         A3  A1  A2         A2  A1  A4  A3

		A3  A4         A4  A5  A6         A5  A6  A7  A8

		A4  A3         A6  A4  A5         A6  A5  A8  A7

		A5  A6         A7  A8  A9         A9  A10 A11 A12

		A6  A5         A9  A7  A8         A10 A9  A12 A11

		..  ..         ..  ..  ..         ..  ..  ..  ..

		Here we see layouts closely akin to 'RAID1E - Integrated

		Offset Stripe Mirroring'.



<#raid_devs>: The number of devices composing the array.

	Each device consists of two entries.  The first is the device

	containing the metadata (if any); the second is the one containing the
@@ -142,3 +170,5 @@ Version History 
1.3.0	Added support for RAID 10

1.3.1	Allow device replacement/rebuild for RAID 10

1.3.2   Fix/improve redundancy checking for RAID10

1.4.0	Non-functional change.  Removes arg from mapping function.

1.4.1   Add RAID10 "far" and "offset" algorithm support.

Documentation/devicetree/bindings/mfd/ab8500.txt

+1 −5
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ Required parent device properties: 
                                  4 = active high level-sensitive

                                  8 = active low level-sensitive



Optional parent device properties:

- reg                    : contains the PRCMU mailbox address for the AB8500 i2c port



The AB8500 consists of a large and varied group of sub-devices:



Device                     IRQ Names              Supply Names   Description
@@ -86,9 +83,8 @@ Non-standard child device properties: 
   - stericsson,amic2-bias-vamic1           : Analoge Mic wishes to use a non-standard Vamic

   - stericsson,earpeice-cmv                : Earpeice voltage (only: 950 | 1100 | 1270 | 1580)



ab8500@5 {

ab8500 {

         compatible = "stericsson,ab8500";

         reg = <5>; /* mailbox 5 is i2c */

         interrupts = <0 40 0x4>;

         interrupt-controller;

         #interrupt-cells = <2>;

Documentation/devicetree/bindings/tty/serial/of-serial.txt

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ Required properties: 
	- "nvidia,tegra20-uart"

	- "nxp,lpc3220-uart"

	- "ibm,qpace-nwp-serial"

	- "altr,16550-FIFO32"

	- "altr,16550-FIFO64"

	- "altr,16550-FIFO128"

	- "serial" if the port type is unknown.

- reg : offset and length of the register set for the device.

- interrupts : should contain uart interrupt.

CRA Git | Maintained and supported by SUSTech CRA and CCSE