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

Commit 855e7e71 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 



I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.

I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e09dcd2e 59d53737

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ Juha Yrjola <juha.yrjola@nokia.com> 
Juha Yrjola <juha.yrjola@solidboot.com>

Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Documentation/00-INDEX

+10 −18
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ DMA-ISA-LPC.txt 
	- How to do DMA with ISA (and LPC) devices.

DMA-attributes.txt

	- listing of the various possible attributes a DMA region can have

dmatest.txt

	- how to compile, configure and use the dmatest system.

DocBook/

	- directory with DocBook templates etc. for kernel documentation.

EDID/
@@ -163,8 +161,6 @@ digsig.txt 
	-info on the Digital Signature Verification API

dma-buf-sharing.txt

	- the DMA Buffer Sharing API Guide

dmaengine.txt

	-the DMA Engine API Guide

dontdiff

	- file containing a list of files that should never be diff'ed.

driver-model/
@@ -209,6 +205,8 @@ hid/ 
	- directory with information on human interface devices

highuid.txt

	- notes on the change from 16 bit to 32 bit user/group IDs.

hsi.txt

	- HSI subsystem overview.

hwspinlock.txt

	- hardware spinlock provides hardware assistance for synchronization

timers/
@@ -277,6 +275,8 @@ kprobes.txt 
	- documents the kernel probes debugging feature.

kref.txt

	- docs on adding reference counters (krefs) to kernel objects.

kselftest.txt

	- small unittests for (some) individual codepaths in the kernel.

laptops/

	- directory with laptop related info and laptop driver documentation.

ldm.txt
@@ -285,22 +285,22 @@ leds/ 
	- directory with info about LED handling under Linux.

local_ops.txt

	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

locking/

	- directory with info about kernel locking primitives

lockstat.txt

	- info on collecting statistics on locks (and contention).

lockup-watchdogs.txt

	- info on soft and hard lockup detectors (aka nmi_watchdog).

logo.gif

	- full colour GIF image of Linux logo (penguin - Tux).

logo.txt

	- info on creator of above logo & site to get additional images from.

lzo.txt

	- kernel LZO decompressor input formats

m68k/

	- directory with info about Linux on Motorola 68k architecture.

magic-number.txt

	- list of magic numbers used to mark/protect kernel data structures.

mailbox.txt

	- How to write drivers for the common mailbox framework (IPC).

md.txt

	- info on boot arguments for the multiple devices driver.

media-framework.txt
@@ -327,8 +327,6 @@ mtd/ 
	- directory with info about memory technology devices (flash)

mono.txt

	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

mutex-design.txt

	- info on the generic mutex subsystem.

namespaces/

	- directory with various information about namespaces

netlabel/
@@ -395,10 +393,6 @@ robust-futexes.txt 
	- a description of what robust futexes are.

rpmsg.txt

	- info on the Remote Processor Messaging (rpmsg) Framework

rt-mutex-design.txt

	- description of the RealTime mutex implementation design.

rt-mutex.txt

	- desc. of RT-mutex subsystem with PI (Priority Inheritance) support.

rtc.txt

	- notes on how to use the Real Time Clock (aka CMOS clock) driver.

s390/
@@ -425,8 +419,6 @@ sparse.txt 
	- info on how to obtain and use the sparse tool for typechecking.

spi/

	- overview of Linux kernel Serial Peripheral Interface (SPI) support.

spinlocks.txt

	- info on using spinlocks to provide exclusive access in kernel.

stable_api_nonsense.txt

	- info on why the kernel does not have a stable in-kernel api or abi.

stable_kernel_rules.txt
@@ -483,10 +475,10 @@ wimax/ 
	- directory with info about Intel Wireless Wimax Connections

workqueue.txt

	- information on the Concurrency Managed Workqueue implementation

ww-mutex-design.txt

	- Intro to Mutex wait/would deadlock handling.s

x86/x86_64/

	- directory with info on Linux support for AMD x86-64 (Hammer) machines.

xillybus.txt

	- Overview and basic ui of xillybus driver

xtensa/

	- directory with documents relating to arch/xtensa port/implementation

xz.txt

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+6 −0
Original line number Diff line number Diff line
@@ -52,12 +52,18 @@ Description: Per-pmu performance monitoring events specific to the running syste 
			event=0x2abc

			event=0x423,inv,cmask=0x3

			domain=0x1,offset=0x8,starting_index=0xffff

			domain=0x1,offset=0x8,core=?



		Each of the assignments indicates a value to be assigned to a

		particular set of bits (as defined by the format file

		corresponding to the <term>) in the perf_event structure passed

		to the perf_open syscall.



		In the case of the last example, a value replacing "?" would

		need to be provided by the user selecting the particular event.

		This is referred to as "event parameterization". Event

		parameters have the format 'param=?'.



What: /sys/bus/event_source/devices/<pmu>/events/<event>.unit

Date: 2014/02/24

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7

+22 −0
Original line number Diff line number Diff line
@@ -21,3 +21,25 @@ Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> 
Description:

		Exposes the "version" field of the 24x7 catalog. This is also

		extractable from the provided binary "catalog" sysfs entry.



What:		/sys/bus/event_source/devices/hv_24x7/event_descs/<event-name>

Date:		February 2014

Contact:	Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>

Description:

		Provides the description of a particular event as provided by

		the firmware. If firmware does not provide a description, no

		file will be created.



		Note that the event-name lacks the domain suffix appended for

		events in the events/ dir.



What:		/sys/bus/event_source/devices/hv_24x7/event_long_descs/<event-name>

Date:		February 2014

Contact:	Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>

Description:

		Provides the "long" description of a particular event as

		provided by the firmware. If firmware does not provide a

		description, no file will be created.



		Note that the event-name lacks the domain suffix appended for

		events in the events/ dir.

Documentation/ABI/testing/sysfs-class-cxl

+65 −2
Original line number Diff line number Diff line 
Note: Attributes that are shared between devices are stored in the directory

pointed to by the symlink device/.

Example: The real path of the attribute /sys/class/cxl/afu0.0s/irqs_max is

/sys/class/cxl/afu0.0s/device/irqs_max, i.e. /sys/class/cxl/afu0.0/irqs_max.





Slave contexts (eg. /sys/class/cxl/afu0.0s):



What:           /sys/class/cxl/<afu>/irqs_max
@@ -67,7 +73,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Decimal value of the current version of the kernel/user API.



What:           /sys/class/cxl/<afu>/api_version_com

What:           /sys/class/cxl/<afu>/api_version_compatible

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only
@@ -75,6 +81,42 @@ Description: read only 
                this this kernel supports.





AFU configuration records (eg. /sys/class/cxl/afu0.0/cr0):



An AFU may optionally export one or more PCIe like configuration records, known

as AFU configuration records, which will show up here (if present).



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		Hexadecimal value of the vendor ID found in this AFU

		configuration record.



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		Hexadecimal value of the device ID found in this AFU

		configuration record.



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		Hexadecimal value of the class code found in this AFU

		configuration record.



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

Date:           February 2015

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

		This binary file provides raw access to the AFU configuration

		record. The format is expected to match the either the standard

		or extended configuration space defined by the PCIe

		specification.







Master contexts (eg. /sys/class/cxl/afu0.0m)
@@ -106,7 +148,7 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Identifies the CAIA Version the card implements.



What:           /sys/class/cxl/<card>/psl_version

What:           /sys/class/cxl/<card>/psl_revision

Date:           September 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only
@@ -127,3 +169,24 @@ Contact: linuxppc-dev@lists.ozlabs.org 
Description:    read only

                Will return "user" or "factory" depending on the image loaded

                onto the card.



What:           /sys/class/cxl/<card>/load_image_on_perst

Date:           December 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read/write

                Valid entries are "none", "user", and "factory".

                "none" means PERST will not cause image to be loaded to the

                card.  A power cycle is required to load the image.

                "none" could be useful for debugging because the trace arrays

                are preserved.

                "user" and "factory" means PERST will cause either the user or

                user or factory image to be loaded.

                Default is to reload on PERST whichever image the card has

                loaded.



What:           /sys/class/cxl/<card>/reset

Date:           October 2014

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    write only

                Writing 1 will issue a PERST to card which may cause the card

                to reload the FPGA depending on load_image_on_perst.