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

Commit 2db6be6a authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.9-rc2' into asoc-core

Linux 3.9-rc2
parents a93f8e76 f6161aa1
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061
S: USA
S: USA


N: Randy Dunlap
N: Randy Dunlap
E: rdunlap@xenotime.net
E: rdunlap@infradead.org
W: http://www.xenotime.net/linux/linux.html
W: http://www.infradead.org/~rdunlap/
W: http://www.linux-usb.org
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
D: x86 SMP, ACPI, bootflag hacking
D: x86 SMP, ACPI, bootflag hacking
D: documentation, builds
S: (ask for current address)
S: (ask for current address)
S: USA
S: USA


+1 −2
Original line number Original line 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
"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
the build process, and should be ignored in any diff(1)-generated
patch.  The "dontdiff" file is included in the kernel tree in
patch.  The "dontdiff" file is included in the kernel tree in
2.6.12 and later.  For earlier kernel versions, you can get it
2.6.12 and later.
from <http://www.xenotime.net/linux/doc/dontdiff>.


Make sure your patch does not include any extra files which do not
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-
belong in a patch submission.  Make sure to review your patch -after-
+37 −7
Original line number Original line 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        Various RAID10 inspired algorithms chosen by additional params
		- RAID10: Striped Mirrors (aka 'Striping on top of mirrors')
		- RAID10: Striped Mirrors (aka 'Striping on top of mirrors')
		- RAID1E: Integrated Adjacent Stripe Mirroring
		- RAID1E: Integrated Adjacent Stripe Mirroring
		- RAID1E: Integrated Offset Stripe Mirroring
		-  and other similar RAID10 variants
		-  and other similar RAID10 variants


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


        [raid10_copies   <# copies>]
        [raid10_copies   <# copies>]
        [raid10_format   near]
        [raid10_format   <near|far|offset>]
		These two options are used to alter the default layout of
		These two options are used to alter the default layout of
		a RAID10 configuration.  The number of copies is can be
		a RAID10 configuration.  The number of copies is can be
		specified, but the default is 2.  There are other variations
		specified, but the default is 2.  There are also three
		to how the copies are laid down - the default and only current
		variations to how the copies are laid down - the default
		option is "near".  Near copies are what most people think of
		is "near".  Near copies are what most people think of with
		with respect to mirroring.  If these options are left
		respect to mirroring.  If these options are left unspecified,
		unspecified, or 'raid10_copies 2' and/or 'raid10_format near'
		or 'raid10_copies 2' and/or 'raid10_format near' are given,
		are given, then the layouts for 2, 3 and 4 devices are:
		then the layouts for 2, 3 and 4 devices	are:
		2 drives         3 drives          4 drives
		2 drives         3 drives          4 drives
		--------         ----------        --------------
		--------         ----------        --------------
		A1  A1           A1  A1  A2        A1  A1  A2  A2
		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
		3-device layout is what might be called a 'RAID1E - Integrated
		Adjacent Stripe Mirroring'.
		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.
<#raid_devs>: The number of devices composing the array.
	Each device consists of two entries.  The first is the device
	Each device consists of two entries.  The first is the device
	containing the metadata (if any); the second is the one containing the
	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.0	Added support for RAID 10
1.3.1	Allow device replacement/rebuild for RAID 10
1.3.1	Allow device replacement/rebuild for RAID 10
1.3.2   Fix/improve redundancy checking for RAID10
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.
+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ Supported chips:
    Addresses scanned: -
    Addresses scanned: -
    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf
    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf


Author: Guenter Roeck <guenter.roeck@ericsson.com>
Author: Guenter Roeck <linux@roeck-us.net>




Description
Description
+10 −1
Original line number Original line Diff line number Diff line
@@ -4,9 +4,14 @@ Kernel driver adt7410
Supported chips:
Supported chips:
  * Analog Devices ADT7410
  * Analog Devices ADT7410
    Prefix: 'adt7410'
    Prefix: 'adt7410'
    Addresses scanned: I2C 0x48 - 0x4B
    Addresses scanned: None
    Datasheet: Publicly available at the Analog Devices website
    Datasheet: Publicly available at the Analog Devices website
               http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf
               http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf
  * Analog Devices ADT7420
    Prefix: 'adt7420'
    Addresses scanned: None
    Datasheet: Publicly available at the Analog Devices website
               http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf


Author: Hartmut Knaack <knaack.h@gmx.de>
Author: Hartmut Knaack <knaack.h@gmx.de>


@@ -27,6 +32,10 @@ value per second or even justget one sample on demand for power saving.
Besides, it can completely power down its ADC, if power management is
Besides, it can completely power down its ADC, if power management is
required.
required.


The ADT7420 is register compatible, the only differences being the package,
a slightly narrower operating temperature range (-40°C to +150°C), and a
better accuracy (0.25°C instead of 0.50°C.)

Configuration Notes
Configuration Notes
-------------------
-------------------


Loading