Commit c0b59faf authored by Herbert Xu's avatar Herbert Xu
Browse files

Merge branch 'mvebu/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Merge the mvebu/drivers branch of the arm-soc tree which contains
just a single patch bfa1ce5f ("bus:
mvebu-mbus: add mv_mbus_dram_info_nooverlap()") that happens to be
a prerequisite of the new marvell/cesa crypto driver.
parents 28bceeaa bfa1ce5f

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
*.order

*.elf

*.bin

*.tar

*.gz

*.bz2

*.lzma

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver 
S: Gurgaon, India

S: Kuala Lumpur, Malaysia



N: Mohit Kumar

D: ST Microelectronics SPEAr13xx PCI host bridge driver

D: Synopsys Designware PCI host bridge driver



N: Gabor Kuti

M: seasons@falcon.sch.bme.hu

M: seasons@makosteszta.sote.hu

Documentation/ABI/testing/sysfs-block-dm

+22 −0
Original line number Diff line number Diff line
@@ -23,3 +23,25 @@ Description: Device-mapper device suspend state. 
		Contains the value 1 while the device is suspended.

		Otherwise it contains 0. Read-only attribute.

Users:		util-linux, device-mapper udev rules



What:		/sys/block/dm-<num>/dm/rq_based_seq_io_merge_deadline

Date:		March 2015

KernelVersion:	4.1

Contact:	dm-devel@redhat.com

Description:	Allow control over how long a request that is a

		reasonable merge candidate can be queued on the request

		queue.  The resolution of this deadline is in

		microseconds (ranging from 1 to 100000 usecs).

		Setting this attribute to 0 (the default) will disable

		request-based DM's merge heuristic and associated extra

		accounting.  This attribute is not applicable to

		bio-based DM devices so it will only ever report 0 for

		them.



What:		/sys/block/dm-<num>/dm/use_blk_mq

Date:		March 2015

KernelVersion:	4.1

Contact:	dm-devel@redhat.com

Description:	Request-based Device-mapper blk-mq I/O path mode.

		Contains the value 1 if the device is using blk-mq.

		Otherwise it contains 0. Read-only attribute.

Documentation/ABI/testing/sysfs-class-cxl

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ Description: read only 
		Hexadecimal value of the device ID found in this AFU

		configuration record.



What:           /sys/class/cxl/<afu>/cr<config num>/vendor

What:           /sys/class/cxl/<afu>/cr<config num>/class

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

Documentation/ABI/testing/sysfs-class-mtd

+10 −0
Original line number Diff line number Diff line
@@ -222,3 +222,13 @@ Description: 
		The number of blocks that are marked as reserved, if any, in

		this partition. These are typically used to store the in-flash

		bad block table (BBT).



What:		/sys/class/mtd/mtdX/offset

Date:		March 2015

KernelVersion:	4.1

Contact:	linux-mtd@lists.infradead.org

Description:

		For a partition, the offset of that partition from the start

		of the master device in bytes. This attribute is absent on

		main devices, so it can be used to distinguish between

		partitions and devices that aren't partitions.