Skip to content

Commit eb15742

Browse files
gregkhgregkh
committed
Merge 3.4-rc5 into driver-core-next
This was done to resolve a merge issue with the init/main.c file. Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents aac10aa + 69964ea commit eb15742

File tree

811 files changed

+7629
-5437
lines changed

Some content is hidden

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

811 files changed

+7629
-5437
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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/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/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

‎Documentation/feature-removal-schedule.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,3 +538,11 @@ Why: There appear to be no production users of the get_robust_list syscall,
538538
of ASLR. It was only ever intended for debugging, so it should be
539539
removed.
540540
Who: Kees Cook <[email protected]>
541+
542+
----------------------------
543+
544+
What: setitimer accepts user NULL pointer (value)
545+
When: 3.6
546+
Why: setitimer is not returning -EFAULT if user pointer is NULL. This
547+
violates the spec.
548+
Who: Sasikantha Babu <[email protected]>

‎Documentation/filesystems/vfs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ members are defined:
114114
struct file_system_type {
115115
const char *name;
116116
int fs_flags;
117-
struct dentry (*mount) (struct file_system_type *, int,
117+
struct dentry *(*mount) (struct file_system_type *, int,
118118
const char *, void *);
119119
void (*kill_sb) (struct super_block *);
120120
struct module *owner;

‎Documentation/power/freezing-of-tasks.txt

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,39 @@ architectures).
99

1010
II. How does it work?
1111

12-
There are four per-task flags used for that, PF_NOFREEZE, PF_FROZEN, TIF_FREEZE
12+
There are three per-task flags used for that, PF_NOFREEZE, PF_FROZEN
1313
and PF_FREEZER_SKIP (the last one is auxiliary). The tasks that have
1414
PF_NOFREEZE unset (all user space processes and some kernel threads) are
1515
regarded as 'freezable' and treated in a special way before the system enters a
1616
suspend state as well as before a hibernation image is created (in what follows
1717
we only consider hibernation, but the description also applies to suspend).
1818

1919
Namely, as the first step of the hibernation procedure the function
20-
freeze_processes() (defined in kernel/power/process.c) is called. It executes
21-
try_to_freeze_tasks() that sets TIF_FREEZE for all of the freezable tasks and
22-
either wakes them up, if they are kernel threads, or sends fake signals to them,
23-
if they are user space processes. A task that has TIF_FREEZE set, should react
24-
to it by calling the function called __refrigerator() (defined in
25-
kernel/freezer.c), which sets the task's PF_FROZEN flag, changes its state
26-
to TASK_UNINTERRUPTIBLE and makes it loop until PF_FROZEN is cleared for it.
27-
Then, we say that the task is 'frozen' and therefore the set of functions
28-
handling this mechanism is referred to as 'the freezer' (these functions are
29-
defined in kernel/power/process.c, kernel/freezer.c & include/linux/freezer.h).
30-
User space processes are generally frozen before kernel threads.
20+
freeze_processes() (defined in kernel/power/process.c) is called. A system-wide
21+
variable system_freezing_cnt (as opposed to a per-task flag) is used to indicate
22+
whether the system is to undergo a freezing operation. And freeze_processes()
23+
sets this variable. After this, it executes try_to_freeze_tasks() that sends a
24+
fake signal to all user space processes, and wakes up all the kernel threads.
25+
All freezable tasks must react to that by calling try_to_freeze(), which
26+
results in a call to __refrigerator() (defined in kernel/freezer.c), which sets
27+
the task's PF_FROZEN flag, changes its state to TASK_UNINTERRUPTIBLE and makes
28+
it loop until PF_FROZEN is cleared for it. Then, we say that the task is
29+
'frozen' and therefore the set of functions handling this mechanism is referred
30+
to as 'the freezer' (these functions are defined in kernel/power/process.c,
31+
kernel/freezer.c & include/linux/freezer.h). User space processes are generally
32+
frozen before kernel threads.
3133

3234
__refrigerator() must not be called directly. Instead, use the
3335
try_to_freeze() function (defined in include/linux/freezer.h), that checks
34-
the task's TIF_FREEZE flag and makes the task enter __refrigerator() if the
35-
flag is set.
36+
if the task is to be frozen and makes the task enter __refrigerator().
3637

3738
For user space processes try_to_freeze() is called automatically from the
3839
signal-handling code, but the freezable kernel threads need to call it
3940
explicitly in suitable places or use the wait_event_freezable() or
4041
wait_event_freezable_timeout() macros (defined in include/linux/freezer.h)
41-
that combine interruptible sleep with checking if TIF_FREEZE is set and calling
42-
try_to_freeze(). The main loop of a freezable kernel thread may look like the
43-
following one:
42+
that combine interruptible sleep with checking if the task is to be frozen and
43+
calling try_to_freeze(). The main loop of a freezable kernel thread may look
44+
like the following one:
4445

4546
set_freezable();
4647
do {
@@ -53,7 +54,7 @@ following one:
5354
(from drivers/usb/core/hub.c::hub_thread()).
5455

5556
If a freezable kernel thread fails to call try_to_freeze() after the freezer has
56-
set TIF_FREEZE for it, the freezing of tasks will fail and the entire
57+
initiated a freezing operation, the freezing of tasks will fail and the entire
5758
hibernation operation will be cancelled. For this reason, freezable kernel
5859
threads must call try_to_freeze() somewhere or use one of the
5960
wait_event_freezable() and wait_event_freezable_timeout() macros.

‎Documentation/security/keys.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ KEY SERVICE OVERVIEW
123123

124124
The key service provides a number of features besides keys:
125125

126-
(*) The key service defines two special key types:
126+
(*) The key service defines three special key types:
127127

128128
(+) "keyring"
129129

@@ -137,6 +137,18 @@ The key service provides a number of features besides keys:
137137
blobs of data. These can be created, updated and read by userspace,
138138
and aren't intended for use by kernel services.
139139

140+
(+) "logon"
141+
142+
Like a "user" key, a "logon" key has a payload that is an arbitrary
143+
blob of data. It is intended as a place to store secrets which are
144+
accessible to the kernel but not to userspace programs.
145+
146+
The description can be arbitrary, but must be prefixed with a non-zero
147+
length string that describes the key "subclass". The subclass is
148+
separated from the rest of the description by a ':'. "logon" keys can
149+
be created and updated from userspace, but the payload is only
150+
readable from kernel space.
151+
140152
(*) Each process subscribes to three keyrings: a thread-specific keyring, a
141153
process-specific keyring, and a session-specific keyring.
142154

‎Documentation/sound/alsa/HD-Audio-Models.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ ALC680
4343

4444
ALC882/883/885/888/889
4545
======================
46-
N/A
46+
acer-aspire-4930g Acer Aspire 4930G/5930G/6530G/6930G/7730G
47+
acer-aspire-8930g Acer Aspire 8330G/6935G
48+
acer-aspire Acer Aspire others
4749

4850
ALC861/660
4951
==========

‎Documentation/usb/URB.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,28 @@ that if the completion handler or anyone else tries to resubmit it
168168
they will get a -EPERM error. Thus you can be sure that when
169169
usb_kill_urb() returns, the URB is totally idle.
170170

171+
There is a lifetime issue to consider. An URB may complete at any
172+
time, and the completion handler may free the URB. If this happens
173+
while usb_unlink_urb or usb_kill_urb is running, it will cause a
174+
memory-access violation. The driver is responsible for avoiding this,
175+
which often means some sort of lock will be needed to prevent the URB
176+
from being deallocated while it is still in use.
177+
178+
On the other hand, since usb_unlink_urb may end up calling the
179+
completion handler, the handler must not take any lock that is held
180+
when usb_unlink_urb is invoked. The general solution to this problem
181+
is to increment the URB's reference count while holding the lock, then
182+
drop the lock and call usb_unlink_urb or usb_kill_urb, and then
183+
decrement the URB's reference count. You increment the reference
184+
count by calling
185+
186+
struct urb *usb_get_urb(struct urb *urb)
187+
188+
(ignore the return value; it is the same as the argument) and
189+
decrement the reference count by calling usb_free_urb. Of course,
190+
none of this is necessary if there's no danger of the URB being freed
191+
by the completion handler.
192+
171193

172194
1.7. What about the completion handler?
173195

‎Documentation/usb/usbmon.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ An input control transfer to get a port status.
183183
d5ea89a0 3575914555 S Ci:1:001:0 s a3 00 0000 0003 0004 4 <
184184
d5ea89a0 3575914560 C Ci:1:001:0 0 4 = 01050000
185185

186-
An output bulk transfer to send a SCSI command 0x5E in a 31-byte Bulk wrapper
187-
to a storage device at address 5:
186+
An output bulk transfer to send a SCSI command 0x28 (READ_10) in a 31-byte
187+
Bulk wrapper to a storage device at address 5:
188188

189-
dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 5e000000 00000000 00000600 00000000 00000000 00000000 000000
189+
dd65f0e8 4128379752 S Bo:1:005:2 -115 31 = 55534243 ad000000 00800000 80010a28 20000000 20000040 00000000 000000
190190
dd65f0e8 4128379808 C Bo:1:005:2 0 31 >
191191

192192
* Raw binary format and API

‎MAINTAINERS

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,8 +1521,8 @@ M: Gustavo Padovan <[email protected]>
15211521
M: Johan Hedberg <[email protected]>
15221522
L: [email protected]
15231523
W: http://www.bluez.org/
1524-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
1525-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
1524+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
1525+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
15261526
S: Maintained
15271527
F: drivers/bluetooth/
15281528

@@ -1532,8 +1532,8 @@ M: Gustavo Padovan <[email protected]>
15321532
M: Johan Hedberg <[email protected]>
15331533
L: [email protected]
15341534
W: http://www.bluez.org/
1535-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
1536-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
1535+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
1536+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
15371537
S: Maintained
15381538
F: net/bluetooth/
15391539
F: include/net/bluetooth/
@@ -2321,9 +2321,9 @@ S: Supported
23212321
F: drivers/acpi/dock.c
23222322

23232323
DOCUMENTATION
2324-
M: Randy Dunlap <rdunlap@xenotime.net>
2324+
M: Rob Landley <rob@landley.net>
23252325
L: [email protected]
2326-
T: quilt http://xenotime.net/kernel-doc-patches/current/
2326+
T: TBD
23272327
S: Maintained
23282328
F: Documentation/
23292329

@@ -3592,6 +3592,7 @@ S: Supported
35923592
F: drivers/net/wireless/iwlegacy/
35933593

35943594
INTEL WIRELESS WIFI LINK (iwlwifi)
3595+
M: Johannes Berg <[email protected]>
35953596
M: Wey-Yi Guy <[email protected]>
35963597
M: Intel Linux Wireless <[email protected]>
35973598
L: [email protected]
@@ -4533,8 +4534,7 @@ S: Supported
45334534
F: drivers/net/ethernet/myricom/myri10ge/
45344535

45354536
NATSEMI ETHERNET DRIVER (DP8381x)
4536-
M: Tim Hockin <[email protected]>
4537-
S: Maintained
4537+
S: Orphan
45384538
F: drivers/net/ethernet/natsemi/natsemi.c
45394539

45404540
NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
@@ -4803,6 +4803,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
48034803
F: arch/arm/mach-omap2/clockdomain44xx.c
48044804

48054805
OMAP AUDIO SUPPORT
4806+
M: Peter Ujfalusi <[email protected]>
48064807
M: Jarkko Nikula <[email protected]>
48074808
L: [email protected] (subscribers-only)
48084809
L: [email protected]
@@ -5117,6 +5118,11 @@ F: drivers/i2c/busses/i2c-pca-*
51175118
F: include/linux/i2c-algo-pca.h
51185119
F: include/linux/i2c-pca-platform.h
51195120

5121+
PCDP - PRIMARY CONSOLE AND DEBUG PORT
5122+
M: Khalid Aziz <[email protected]>
5123+
S: Maintained
5124+
F: drivers/firmware/pcdp.*
5125+
51205126
PCI ERROR RECOVERY
51215127
M: Linas Vepstas <[email protected]>
51225128
L: [email protected]
@@ -6466,6 +6472,7 @@ S: Odd Fixes
64666472
F: drivers/staging/olpc_dcon/
64676473

64686474
STAGING - OZMO DEVICES USB OVER WIFI DRIVER
6475+
M: Rupesh Gujare <[email protected]>
64696476
M: Chris Kelly <[email protected]>
64706477
S: Maintained
64716478
F: drivers/staging/ozwpan/
@@ -7461,8 +7468,7 @@ F: include/linux/wm97xx.h
74617468

74627469
WOLFSON MICROELECTRONICS DRIVERS
74637470
M: Mark Brown <[email protected]>
7464-
M: Ian Lartey <[email protected]>
7465-
M: Dimitris Papastamos <[email protected]>
7471+
L: [email protected]
74667472
T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc
74677473
T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
74687474
W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
@@ -7573,8 +7579,8 @@ F: Documentation/filesystems/xfs.txt
75737579
F: fs/xfs/
75747580

75757581
XILINX AXI ETHERNET DRIVER
7576-
M: Ariane Keller <[email protected]>
7577-
M: Daniel Borkmann <[email protected]>
7582+
M: Anirudha Sarangi <[email protected]>
7583+
M: John Linn <[email protected]>
75787584
S: Maintained
75797585
F: drivers/net/ethernet/xilinx/xilinx_axienet*
75807586

0 commit comments

Comments
 (0)