Skip to content

Commit 06e65cb

Browse files
brooniebroonie
committed
Merge branches 'regmap-core', 'regmap-stride', 'regmap-mmio' and 'regmap-irq' into regmap-next
4 parents f298536 + 25061d2 + 72b39f6 + 2431d0a commit 06e65cb

File tree

1,532 files changed

+19031
-10317
lines changed

Some content is hidden

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

1,532 files changed

+19031
-10317
lines changed

‎Documentation/ABI/stable/sysfs-driver-usb-usbtmc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
What: /sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities
2-
What: /sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities
1+
What: /sys/bus/usb/drivers/usbtmc/*/interface_capabilities
2+
What: /sys/bus/usb/drivers/usbtmc/*/device_capabilities
33
Date: August 2008
44
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
55
Description:
@@ -12,8 +12,8 @@ Description:
1212
The files are read only.
1313

1414

15-
What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities
16-
What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities
15+
What: /sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities
16+
What: /sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities
1717
Date: August 2008
1818
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1919
Description:
@@ -27,7 +27,7 @@ Description:
2727
The files are read only.
2828

2929

30-
What: /sys/bus/usb/drivers/usbtmc/devices/*/TermChar
30+
What: /sys/bus/usb/drivers/usbtmc/*/TermChar
3131
Date: August 2008
3232
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
3333
Description:
@@ -40,7 +40,7 @@ Description:
4040
sent to the device or not.
4141

4242

43-
What: /sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled
43+
What: /sys/bus/usb/drivers/usbtmc/*/TermCharEnabled
4444
Date: August 2008
4545
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
4646
Description:
@@ -51,7 +51,7 @@ Description:
5151
published by the USB-IF.
5252

5353

54-
What: /sys/bus/usb/drivers/usbtmc/devices/*/auto_abort
54+
What: /sys/bus/usb/drivers/usbtmc/*/auto_abort
5555
Date: August 2008
5656
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
5757
Description:

‎Documentation/ABI/testing/sysfs-block-rssd

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/block/rssd*/registers
2+
Date: March 2012
3+
KernelVersion: 3.3
4+
Contact: Asai Thambi S P <asamymuthupa@micron.com>
5+
Description: This is a read-only file. Dumps below driver information and
6+
hardware registers.
7+
- S ACTive
8+
- Command Issue
9+
- Allocated
10+
- Completed
11+
- PORT IRQ STAT
12+
- HOST IRQ STAT
13+
14+
What: /sys/block/rssd*/status
15+
Date: April 2012
16+
KernelVersion: 3.4
17+
Contact: Asai Thambi S P <asamymuthupa@micron.com>
18+
Description: This is a read-only file. Indicates the status of the device.

‎Documentation/ABI/testing/sysfs-bus-hsi

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/bus/hsi
2+
Date: April 2012
3+
KernelVersion: 3.4
4+
Contact: Carlos Chinea <carlos.chinea@nokia.com>
5+
Description:
6+
High Speed Synchronous Serial Interface (HSI) is a
7+
serial interface mainly used for connecting application
8+
engines (APE) with cellular modem engines (CMT) in cellular
9+
handsets.
10+
The bus will be populated with devices (hsi_clients) representing
11+
the protocols available in the system. Bus drivers implement
12+
those protocols.
13+
14+
What: /sys/bus/hsi/devices/.../modalias
15+
Date: April 2012
16+
KernelVersion: 3.4
17+
Contact: Carlos Chinea <carlos.chinea@nokia.com>
18+
Description: Stores the same MODALIAS value emitted by uevent
19+
Format: hsi:<hsi_client device name>

‎Documentation/ABI/testing/sysfs-cfq-target-latency

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/block/<device>/iosched/target_latency
2+
Date: March 2012
3+
contact: Tao Ma <boyu.mt@taobao.com>
4+
Description:
5+
The /sys/block/<device>/iosched/target_latency only exists
6+
when the user sets cfq to /sys/block/<device>/scheduler.
7+
It contains an estimated latency time for the cfq. cfq will
8+
use it to calculate the time slice used for every task.

‎Documentation/DMA-attributes.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,21 @@ may be weakly ordered, that is that reads and writes may pass each other.
3131
Since it is optional for platforms to implement DMA_ATTR_WEAK_ORDERING,
3232
those that do not will simply ignore the attribute and exhibit default
3333
behavior.
34+
35+
DMA_ATTR_WRITE_COMBINE
36+
----------------------
37+
38+
DMA_ATTR_WRITE_COMBINE specifies that writes to the mapping may be
39+
buffered to improve performance.
40+
41+
Since it is optional for platforms to implement DMA_ATTR_WRITE_COMBINE,
42+
those that do not will simply ignore the attribute and exhibit default
43+
behavior.
44+
45+
DMA_ATTR_NON_CONSISTENT
46+
-----------------------
47+
48+
DMA_ATTR_NON_CONSISTENT lets the platform to choose to return either
49+
consistent or non-consistent memory as it sees fit. By using this API,
50+
you are guaranteeing to the platform that you have all the correct and
51+
necessary sync points for this memory in the driver.

‎Documentation/DocBook/device-drivers.tmpl

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,4 +446,21 @@ X!Idrivers/video/console/fonts.c
446446
!Edrivers/i2c/i2c-core.c
447447
</chapter>
448448

449+
<chapter id="hsi">
450+
<title>High Speed Synchronous Serial Interface (HSI)</title>
451+
452+
<para>
453+
High Speed Synchronous Serial Interface (HSI) is a
454+
serial interface mainly used for connecting application
455+
engines (APE) with cellular modem engines (CMT) in cellular
456+
handsets.
457+
458+
HSI provides multiplexing for up to 16 logical channels,
459+
low-latency and full duplex communication.
460+
</para>
461+
462+
!Iinclude/linux/hsi/hsi.h
463+
!Edrivers/hsi/hsi.c
464+
</chapter>
465+
449466
</book>

‎Documentation/DocBook/media/v4l/pixfmt-nv12m.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<refentry id="V4L2-PIX-FMT-NV12M">
22
<refmeta>
3-
<refentrytitle>V4L2_PIX_FMT_NV12M ('NV12M')</refentrytitle>
3+
<refentrytitle>V4L2_PIX_FMT_NV12M ('NM12')</refentrytitle>
44
&manvol;
55
</refmeta>
66
<refnamediv>

‎Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<refentry id="V4L2-PIX-FMT-YUV420M">
22
<refmeta>
3-
<refentrytitle>V4L2_PIX_FMT_YUV420M ('YU12M')</refentrytitle>
3+
<refentrytitle>V4L2_PIX_FMT_YUV420M ('YM12')</refentrytitle>
44
&manvol;
55
</refmeta>
66
<refnamediv>

‎Documentation/cgroups/cpusets.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ and name space for cpusets, with a minimum of additional kernel code.
217217

218218
The cpus and mems files in the root (top_cpuset) cpuset are
219219
read-only. The cpus file automatically tracks the value of
220-
cpu_online_map using a CPU hotplug notifier, and the mems file
220+
cpu_online_mask using a CPU hotplug notifier, and the mems file
221221
automatically tracks the value of node_states[N_HIGH_MEMORY]--i.e.,
222222
nodes with memory--using the cpuset_track_online_nodes() hook.
223223

‎Documentation/cgroups/memory.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April)
3434

3535
Features:
3636
- accounting anonymous pages, file caches, swap caches usage and limiting them.
37-
- private LRU and reclaim routine. (system's global LRU and private LRU
38-
work independently from each other)
37+
- pages are linked to per-memcg LRU exclusively, and there is no global LRU.
3938
- optionally, memory+swap usage can be accounted and limited.
4039
- hierarchical accounting
4140
- soft limit
@@ -154,7 +153,7 @@ updated. page_cgroup has its own LRU on cgroup.
154153
2.2.1 Accounting details
155154

156155
All mapped anon pages (RSS) and cache pages (Page Cache) are accounted.
157-
Some pages which are never reclaimable and will not be on the global LRU
156+
Some pages which are never reclaimable and will not be on the LRU
158157
are not accounted. We just account pages under usual VM management.
159158

160159
RSS pages are accounted at page_fault unless they've already been accounted

0 commit comments

Comments
 (0)