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

Commit 698f6700 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch '4.7/scsi-queue' of... 

Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi

 into for-4.7-zac

Pulling in the dependencies for further ZAC changes.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 7780081c 13f30771

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de> 
Brian Avery <b.avery@hp.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Christoph Hellwig <hch@lst.de>

Christophe Ricard <christophe.ricard@gmail.com>

Corey Minyard <minyard@acm.org>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

David Brownell <david-b@pacbell.net>

Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl

+12 −17
Original line number Original line Diff line number Diff line 
What:		/sys/devices/platform/<i2c-demux-name>/cur_master

What:		/sys/devices/platform/<i2c-demux-name>/available_masters

Date:		January 2016

Date:		January 2016

KernelVersion:	4.6

KernelVersion:	4.6

Contact:	Wolfram Sang <wsa@the-dreams.de>

Contact:	Wolfram Sang <wsa@the-dreams.de>

Description:

Description:

		Reading the file will give you a list of masters which can be

		selected for a demultiplexed bus. The format is

		"<index>:<name>". Example from a Renesas Lager board:





This file selects the active I2C master for a demultiplexed bus.

		0:/i2c@e6500000 1:/i2c@e6508000





Write 0 there for the first master, 1 for the second etc. Reading the file will

What:		/sys/devices/platform/<i2c-demux-name>/current_master

give you a list with the active master marked. Example from a Renesas Lager

Date:		January 2016

board:

KernelVersion:	4.6



Contact:	Wolfram Sang <wsa@the-dreams.de>

root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master

Description:

* 0 - /i2c@9

		This file selects/shows the active I2C master for a demultiplexed

  1 - /i2c@e6520000

		bus. It uses the <index> value from the file 'available_masters'.
 
  2 - /i2c@e6530000



root@Lager:~# echo 2 > /sys/devices/platform/i2c@8/cur_master



root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master

  0 - /i2c@9

  1 - /i2c@e6520000

* 2 - /i2c@e6530000

Documentation/devicetree/bindings/clock/qca,ath79-pll.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ Binding for Qualcomm Atheros AR7xxx/AR9XXX PLL controller 
The PPL controller provides the 3 main clocks of the SoC: CPU, DDR and AHB.

The PPL controller provides the 3 main clocks of the SoC: CPU, DDR and AHB.





Required Properties:

Required Properties:

- compatible: has to be "qca,<soctype>-cpu-intc" and one of the following

- compatible: has to be "qca,<soctype>-pll" and one of the following

  fallbacks:

  fallbacks:

  - "qca,ar7100-pll"

  - "qca,ar7100-pll"

  - "qca,ar7240-pll"

  - "qca,ar7240-pll"
@@ -21,8 +21,8 @@ Optional properties: 




Example:

Example:





	memory-controller@18050000 {

	pll-controller@18050000 {

		compatible = "qca,ar9132-ppl", "qca,ar9130-pll";

		compatible = "qca,ar9132-pll", "qca,ar9130-pll";

		reg = <0x18050000 0x20>;

		reg = <0x18050000 0x20>;





		clock-names = "ref";

		clock-names = "ref";

Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt

+6 −6
Original line number Original line Diff line number Diff line
@@ -134,12 +134,12 @@ mfio80 ddr_debug, mips_trace_data, mips_debug 
mfio81		dreq0, mips_trace_data, eth_debug

mfio81		dreq0, mips_trace_data, eth_debug

mfio82		dreq1, mips_trace_data, eth_debug

mfio82		dreq1, mips_trace_data, eth_debug

mfio83		mips_pll_lock, mips_trace_data, usb_debug

mfio83		mips_pll_lock, mips_trace_data, usb_debug

mfio84		sys_pll_lock, mips_trace_data, usb_debug

mfio84		audio_pll_lock, mips_trace_data, usb_debug

mfio85		wifi_pll_lock, mips_trace_data, sdhost_debug

mfio85		rpu_v_pll_lock, mips_trace_data, sdhost_debug

mfio86		bt_pll_lock, mips_trace_data, sdhost_debug

mfio86		rpu_l_pll_lock, mips_trace_data, sdhost_debug

mfio87		rpu_v_pll_lock, dreq2, socif_debug

mfio87		sys_pll_lock, dreq2, socif_debug

mfio88		rpu_l_pll_lock, dreq3, socif_debug

mfio88		wifi_pll_lock, dreq3, socif_debug

mfio89		audio_pll_lock, dreq4, dreq5

mfio89		bt_pll_lock, dreq4, dreq5

tck

tck

trstn

trstn

tdi

tdi

Documentation/filesystems/cramfs.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ the update lasts only as long as the inode is cached in memory, after 
which the timestamp reverts to 1970, i.e. moves backwards in time.

which the timestamp reverts to 1970, i.e. moves backwards in time.





Currently, cramfs must be written and read with architectures of the

Currently, cramfs must be written and read with architectures of the

same endianness, and can be read only by kernels with PAGE_CACHE_SIZE

same endianness, and can be read only by kernels with PAGE_SIZE

== 4096.  At least the latter of these is a bug, but it hasn't been

== 4096.  At least the latter of these is a bug, but it hasn't been

decided what the best fix is.  For the moment if you have larger pages

decided what the best fix is.  For the moment if you have larger pages

you can just change the #define in mkcramfs.c, so long as you don't

you can just change the #define in mkcramfs.c, so long as you don't