Skip to content

Commit 0a87a2d

Browse files
danvetdanvet
committed
Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued
Conflicts: drivers/gpu/drm/i915/intel_runtime_pm.c Separate branch so that Takashi can also pull just this refactoring into sound-next. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2 parents 7226572 + fcf3aac commit 0a87a2d

File tree

10,029 files changed

+401314
-300476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,029 files changed

+401314
-300476
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,6 @@ x509.genkey
9696

9797
# Kconfig presets
9898
all.config
99+
100+
# Kdevelop4
101+
*.kdev4

‎.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
1717
Al Viro <viro@ftp.linux.org.uk>
1818
Al Viro <viro@zenIV.linux.org.uk>
1919
Andreas Herrmann <aherrman@de.ibm.com>
20-
Andrew Morton <akpm@osdl.org>
20+
Andrew Morton <akpm@linux-foundation.org>
2121
Andrew Vasquez <andrew.vasquez@qlogic.com>
2222
Andy Adamson <andros@citi.umich.edu>
2323
Archit Taneja <archit@ti.com>
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de>
5151
Greg Kroah-Hartman <greg@kroah.com>
5252
Henk Vergonet <Henk.Vergonet@gmail.com>
5353
Henrik Kretzschmar <henne@nachtwindheim.de>
54+
Henrik Rydberg <rydberg@bitmath.org>
5455
Herbert Xu <herbert@gondor.apana.org.au>
5556
Jacob Shin <Jacob.Shin@amd.com>
5657
James Bottomley <jejb@mulgrave.(none)>
@@ -102,6 +103,8 @@ Rudolf Marek <R.Marek@sh.cvut.cz>
102103
Rui Saraiva <rmps@joel.ist.utl.pt>
103104
Sachin P Sant <ssant@in.ibm.com>
104105
Sam Ravnborg <sam@mars.ravnborg.org>
106+
Santosh Shilimkar <ssantosh@kernel.org>
107+
Santosh Shilimkar <santosh.shilimkar@oracle.org>
105108
Sascha Hauer <s.hauer@pengutronix.de>
106109
S.Çağlar Onur <caglar@pardus.org.tr>
107110
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

‎CREDITS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,14 +1734,14 @@ S: Chapel Hill, North Carolina 27514-4818
17341734
S: USA
17351735

17361736
N: Dave Jones
1737-
E: davej@redhat.com
1737+
E: davej@codemonkey.org.uk
17381738
W: http://www.codemonkey.org.uk
17391739
D: Assorted VIA x86 support.
17401740
D: 2.5 AGPGART overhaul.
17411741
D: CPUFREQ maintenance.
1742-
D: Fedora kernel maintenance.
1742+
D: Fedora kernel maintenance (2003-2014).
1743+
D: 'Trinity' and similar fuzz testing work.
17431744
D: Misc/Other.
1744-
S: 314 Littleton Rd, Westford, MA 01886, USA
17451745

17461746
N: Martin Josfsson
17471747
E: gandalf@wlug.westbo.se

‎Documentation/ABI/stable/sysfs-bus-usb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ Date: January 2008
3232
KernelVersion: 2.6.25
3333
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
3434
Description:
35-
If CONFIG_PM_RUNTIME is enabled then this file
36-
is present. When read, it returns the total time (in msec)
37-
that the USB device has been connected to the machine. This
38-
file is read-only.
35+
If CONFIG_PM is enabled, then this file is present. When read,
36+
it returns the total time (in msec) that the USB device has been
37+
connected to the machine. This file is read-only.
3938
Users:
4039
PowerTOP <powertop@lists.01.org>
4140
https://01.org/powertop/
@@ -45,10 +44,9 @@ Date: January 2008
4544
KernelVersion: 2.6.25
4645
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
4746
Description:
48-
If CONFIG_PM_RUNTIME is enabled then this file
49-
is present. When read, it returns the total time (in msec)
50-
that the USB device has been active, i.e. not in a suspended
51-
state. This file is read-only.
47+
If CONFIG_PM is enabled, then this file is present. When read,
48+
it returns the total time (in msec) that the USB device has been
49+
active, i.e. not in a suspended state. This file is read-only.
5250

5351
Tools can use this file and the connected_duration file to
5452
compute the percentage of time that a device has been active.

‎Documentation/ABI/stable/sysfs-class-udc

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
What: /sys/class/udc/<udc>/a_alt_hnp_support
2+
Date: June 2011
3+
KernelVersion: 3.1
4+
Contact: Felipe Balbi <balbi@kernel.org>
5+
Description:
6+
Indicates if an OTG A-Host supports HNP at an alternate port.
7+
Users:
8+
9+
What: /sys/class/udc/<udc>/a_hnp_support
10+
Date: June 2011
11+
KernelVersion: 3.1
12+
Contact: Felipe Balbi <balbi@kernel.org>
13+
Description:
14+
Indicates if an OTG A-Host supports HNP at this port.
15+
Users:
16+
17+
What: /sys/class/udc/<udc>/b_hnp_enable
18+
Date: June 2011
19+
KernelVersion: 3.1
20+
Contact: Felipe Balbi <balbi@kernel.org>
21+
Description:
22+
Indicates if an OTG A-Host enabled HNP support.
23+
Users:
24+
25+
What: /sys/class/udc/<udc>/current_speed
26+
Date: June 2011
27+
KernelVersion: 3.1
28+
Contact: Felipe Balbi <balbi@kernel.org>
29+
Description:
30+
Indicates the current negotiated speed at this port.
31+
Users:
32+
33+
What: /sys/class/udc/<udc>/is_a_peripheral
34+
Date: June 2011
35+
KernelVersion: 3.1
36+
Contact: Felipe Balbi <balbi@kernel.org>
37+
Description:
38+
Indicates that this port is the default Host on an OTG session
39+
but HNP was used to switch roles.
40+
Users:
41+
42+
What: /sys/class/udc/<udc>/is_otg
43+
Date: June 2011
44+
KernelVersion: 3.1
45+
Contact: Felipe Balbi <balbi@kernel.org>
46+
Description:
47+
Indicates that this port support OTG.
48+
Users:
49+
50+
What: /sys/class/udc/<udc>/maximum_speed
51+
Date: June 2011
52+
KernelVersion: 3.1
53+
Contact: Felipe Balbi <balbi@kernel.org>
54+
Description:
55+
Indicates the maximum USB speed supported by this port.
56+
Users:
57+
58+
What: /sys/class/udc/<udc>/maximum_speed
59+
Date: June 2011
60+
KernelVersion: 3.1
61+
Contact: Felipe Balbi <balbi@kernel.org>
62+
Description:
63+
Indicates the maximum USB speed supported by this port.
64+
Users:
65+
66+
What: /sys/class/udc/<udc>/soft_connect
67+
Date: June 2011
68+
KernelVersion: 3.1
69+
Contact: Felipe Balbi <balbi@kernel.org>
70+
Description:
71+
Allows users to disconnect data pullup resistors thus causing a
72+
logical disconnection from the USB Host.
73+
Users:
74+
75+
What: /sys/class/udc/<udc>/srp
76+
Date: June 2011
77+
KernelVersion: 3.1
78+
Contact: Felipe Balbi <balbi@kernel.org>
79+
Description:
80+
Allows users to manually start Session Request Protocol.
81+
Users:
82+
83+
What: /sys/class/udc/<udc>/state
84+
Date: June 2011
85+
KernelVersion: 3.1
86+
Contact: Felipe Balbi <balbi@kernel.org>
87+
Description:
88+
Indicates current state of the USB Device Controller. Valid
89+
states are: 'not-attached', 'attached', 'powered',
90+
'reconnecting', 'unauthenticated', 'default', 'addressed',
91+
'configured', and 'suspended'; however not all USB Device
92+
Controllers support reporting all states.
93+
Users:

‎Documentation/ABI/stable/sysfs-driver-ib_srp

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ Description: Interface for making ib_srp connect to a new target.
5555
only safe with partial memory descriptor list support enabled
5656
(allow_ext_sg=1).
5757
* comp_vector, a number in the range 0..n-1 specifying the
58-
MSI-X completion vector. Some HCA's allocate multiple (n)
59-
MSI-X vectors per HCA port. If the IRQ affinity masks of
60-
these interrupts have been configured such that each MSI-X
61-
interrupt is handled by a different CPU then the comp_vector
62-
parameter can be used to spread the SRP completion workload
63-
over multiple CPU's.
58+
MSI-X completion vector of the first RDMA channel. Some
59+
HCA's allocate multiple (n) MSI-X vectors per HCA port. If
60+
the IRQ affinity masks of these interrupts have been
61+
configured such that each MSI-X interrupt is handled by a
62+
different CPU then the comp_vector parameter can be used to
63+
spread the SRP completion workload over multiple CPU's.
6464
* tl_retry_count, a number in the range 2..7 specifying the
6565
IB RC retry count.
6666
* queue_size, the maximum number of commands that the
@@ -88,13 +88,26 @@ Description: Whether ib_srp is allowed to include a partial memory
8888
descriptor list in an SRP_CMD when communicating with an SRP
8989
target.
9090

91+
What: /sys/class/scsi_host/host<n>/ch_count
92+
Date: April 1, 2015
93+
KernelVersion: 3.19
94+
Contact: linux-rdma@vger.kernel.org
95+
Description: Number of RDMA channels used for communication with the SRP
96+
target.
97+
9198
What: /sys/class/scsi_host/host<n>/cmd_sg_entries
9299
Date: May 19, 2011
93100
KernelVersion: 2.6.39
94101
Contact: linux-rdma@vger.kernel.org
95102
Description: Maximum number of data buffer descriptors that may be sent to
96103
the target in a single SRP_CMD request.
97104

105+
What: /sys/class/scsi_host/host<n>/comp_vector
106+
Date: September 2, 2013
107+
KernelVersion: 3.11
108+
Contact: linux-rdma@vger.kernel.org
109+
Description: Completion vector used for the first RDMA channel.
110+
98111
What: /sys/class/scsi_host/host<n>/dgid
99112
Date: June 17, 2006
100113
KernelVersion: 2.6.17

‎Documentation/ABI/testing/configfs-usb-gadget-hid

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
What: /config/usb-gadget/gadget/functions/hid.name
2+
Date: Nov 2014
3+
KernelVersion: 3.19
4+
Description:
5+
The attributes:
6+
7+
protocol - HID protocol to use
8+
report_desc - blob corresponding to HID report descriptors
9+
except the data passed through /dev/hidg<N>
10+
report_length - HID report length
11+
subclass - HID device subclass to use

‎Documentation/ABI/testing/configfs-usb-gadget-midi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /config/usb-gadget/gadget/functions/midi.name
2+
Date: Nov 2014
3+
KernelVersion: 3.19
4+
Description:
5+
The attributes:
6+
7+
index - index value for the USB MIDI adapter
8+
id - ID string for the USB MIDI adapter
9+
buflen - MIDI buffer length
10+
qlen - USB read request queue length
11+
in_ports - number of MIDI input ports
12+
out_ports - number of MIDI output ports

‎Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
What: /sys/bus/coresight/devices/<memory_map>.etb/enable_sink
2+
Date: November 2014
3+
KernelVersion: 3.19
4+
Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
5+
Description: (RW) Add/remove a sink from a trace path. There can be multiple
6+
source for a single sink.
7+
ex: echo 1 > /sys/bus/coresight/devices/20010000.etb/enable_sink
8+
9+
What: /sys/bus/coresight/devices/<memory_map>.etb/status
10+
Date: November 2014
11+
KernelVersion: 3.19
12+
Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
13+
Description: (R) List various control and status registers. The specific
14+
layout and content is driver specific.
15+
16+
What: /sys/bus/coresight/devices/<memory_map>.etb/trigger_cntr
17+
Date: November 2014
18+
KernelVersion: 3.19
19+
Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
20+
Description: (RW) Disables write access to the Trace RAM by stopping the
21+
formatter after a defined number of words have been stored
22+
following the trigger event. The number of 32-bit words written
23+
into the Trace RAM following the trigger event is equal to the
24+
value stored in this register+1 (from ARM ETB-TRM).

0 commit comments

Comments
 (0)