Skip to content

Commit 1468cf0

Browse files
lenblenb
committed
Merge branches 'bugzilla-14337', 'bugzilla-14998', 'bugzilla-15407', 'bugzilla-15903' and 'misc-2.6.34' into release
5 parents f238b41 + 5cc4a0f + ea5bc73 + 11439a6 + 4bdae98 commit 1468cf0

File tree

596 files changed

+8675
-3088
lines changed

Some content is hidden

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

596 files changed

+8675
-3088
lines changed

‎Documentation/DocBook/libata.tmpl

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,6 @@ void (*dev_config) (struct ata_port *, struct ata_device *);
107107
issue of SET FEATURES - XFER MODE, and prior to operation.
108108
</para>
109109
<para>
110-
Called by ata_device_add() after ata_dev_identify() determines
111-
a device is present.
112-
</para>
113-
<para>
114110
This entry may be specified as NULL in ata_port_operations.
115111
</para>
116112

@@ -154,8 +150,8 @@ unsigned int (*mode_filter) (struct ata_port *, struct ata_device *, unsigned in
154150

155151
<sect2><title>Taskfile read/write</title>
156152
<programlisting>
157-
void (*tf_load) (struct ata_port *ap, struct ata_taskfile *tf);
158-
void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);
153+
void (*sff_tf_load) (struct ata_port *ap, struct ata_taskfile *tf);
154+
void (*sff_tf_read) (struct ata_port *ap, struct ata_taskfile *tf);
159155
</programlisting>
160156

161157
<para>
@@ -164,36 +160,35 @@ void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);
164160
hardware registers / DMA buffers, to obtain the current set of
165161
taskfile register values.
166162
Most drivers for taskfile-based hardware (PIO or MMIO) use
167-
ata_tf_load() and ata_tf_read() for these hooks.
163+
ata_sff_tf_load() and ata_sff_tf_read() for these hooks.
168164
</para>
169165

170166
</sect2>
171167

172168
<sect2><title>PIO data read/write</title>
173169
<programlisting>
174-
void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);
170+
void (*sff_data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);
175171
</programlisting>
176172

177173
<para>
178174
All bmdma-style drivers must implement this hook. This is the low-level
179175
operation that actually copies the data bytes during a PIO data
180176
transfer.
181-
Typically the driver
182-
will choose one of ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), or
183-
ata_mmio_data_xfer().
177+
Typically the driver will choose one of ata_sff_data_xfer_noirq(),
178+
ata_sff_data_xfer(), or ata_sff_data_xfer32().
184179
</para>
185180

186181
</sect2>
187182

188183
<sect2><title>ATA command execute</title>
189184
<programlisting>
190-
void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf);
185+
void (*sff_exec_command)(struct ata_port *ap, struct ata_taskfile *tf);
191186
</programlisting>
192187

193188
<para>
194189
causes an ATA command, previously loaded with
195190
->tf_load(), to be initiated in hardware.
196-
Most drivers for taskfile-based hardware use ata_exec_command()
191+
Most drivers for taskfile-based hardware use ata_sff_exec_command()
197192
for this hook.
198193
</para>
199194

@@ -218,29 +213,23 @@ command.
218213

219214
<sect2><title>Read specific ATA shadow registers</title>
220215
<programlisting>
221-
u8 (*check_status)(struct ata_port *ap);
222-
u8 (*check_altstatus)(struct ata_port *ap);
216+
u8 (*sff_check_status)(struct ata_port *ap);
217+
u8 (*sff_check_altstatus)(struct ata_port *ap);
223218
</programlisting>
224219

225220
<para>
226221
Reads the Status/AltStatus ATA shadow register from
227222
hardware. On some hardware, reading the Status register has
228223
the side effect of clearing the interrupt condition.
229224
Most drivers for taskfile-based hardware use
230-
ata_check_status() for this hook.
231-
</para>
232-
<para>
233-
Note that because this is called from ata_device_add(), at
234-
least a dummy function that clears device interrupts must be
235-
provided for all drivers, even if the controller doesn't
236-
actually have a taskfile status register.
225+
ata_sff_check_status() for this hook.
237226
</para>
238227

239228
</sect2>
240229

241230
<sect2><title>Select ATA device on bus</title>
242231
<programlisting>
243-
void (*dev_select)(struct ata_port *ap, unsigned int device);
232+
void (*sff_dev_select)(struct ata_port *ap, unsigned int device);
244233
</programlisting>
245234

246235
<para>
@@ -251,9 +240,7 @@ void (*dev_select)(struct ata_port *ap, unsigned int device);
251240
</para>
252241
<para>
253242
Most drivers for taskfile-based hardware use
254-
ata_std_dev_select() for this hook. Controllers which do not
255-
support second drives on a port (such as SATA contollers) will
256-
use ata_noop_dev_select().
243+
ata_sff_dev_select() for this hook.
257244
</para>
258245

259246
</sect2>
@@ -441,13 +428,13 @@ void (*irq_clear) (struct ata_port *);
441428
to struct ata_host_set.
442429
</para>
443430
<para>
444-
Most legacy IDE drivers use ata_interrupt() for the
431+
Most legacy IDE drivers use ata_sff_interrupt() for the
445432
irq_handler hook, which scans all ports in the host_set,
446433
determines which queued command was active (if any), and calls
447-
ata_host_intr(ap,qc).
434+
ata_sff_host_intr(ap,qc).
448435
</para>
449436
<para>
450-
Most legacy IDE drivers use ata_bmdma_irq_clear() for the
437+
Most legacy IDE drivers use ata_sff_irq_clear() for the
451438
irq_clear() hook, which simply clears the interrupt and error
452439
flags in the DMA status register.
453440
</para>
@@ -496,10 +483,6 @@ void (*host_stop) (struct ata_host_set *host_set);
496483
data from port at this time.
497484
</para>
498485
<para>
499-
Many drivers use ata_port_stop() as this hook, which frees the
500-
PRD table.
501-
</para>
502-
<para>
503486
->host_stop() is called after all ->port_stop() calls
504487
have completed. The hook must finalize hardware shutdown, release DMA
505488
and other resources, etc.

‎Documentation/HOWTO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ process is as follows:
234234
Linus, usually the patches that have already been included in the
235235
-next kernel for a few weeks. The preferred way to submit big changes
236236
is using git (the kernel's source management tool, more information
237-
can be found at http://git.or.cz/) but plain patches are also just
237+
can be found at http://git-scm.com/) but plain patches are also just
238238
fine.
239239
- After two weeks a -rc1 kernel is released it is now possible to push
240240
only patches that do not include new features that could affect the

‎Documentation/cgroups/cgroups.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ containing the following files describing that cgroup:
235235
- cgroup.procs: list of tgids in the cgroup. This list is not
236236
guaranteed to be sorted or free of duplicate tgids, and userspace
237237
should sort/uniquify the list if this property is required.
238-
Writing a tgid into this file moves all threads with that tgid into
239-
this cgroup.
238+
This is a read-only file, for now.
240239
- notify_on_release flag: run the release agent on exit?
241240
- release_agent: the path to use for release notifications (this file
242241
exists in the top cgroup only)

‎Documentation/i2c/writing-clients

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ structure at all. You should use this to keep device-specific data.
7474
/* retrieve the value */
7575
void *i2c_get_clientdata(const struct i2c_client *client);
7676

77+
Note that starting with kernel 2.6.34, you don't have to set the `data' field
78+
to NULL in remove() or if probe() failed anymore. The i2c-core does this
79+
automatically on these occasions. Those are also the only times the core will
80+
touch this field.
81+
7782

7883
Accessing the client
7984
====================

‎Documentation/input/elantech.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ byte 0:
333333
byte 1:
334334

335335
bit 7 6 5 4 3 2 1 0
336-
x15 x14 x13 x12 x11 x10 x9 x8
336+
. . . . . x10 x9 x8
337337

338338
byte 2:
339339

340340
bit 7 6 5 4 3 2 1 0
341341
x7 x6 x5 x4 x4 x2 x1 x0
342342

343-
x15..x0 = absolute x value (horizontal)
343+
x10..x0 = absolute x value (horizontal)
344344

345345
byte 3:
346346

@@ -350,14 +350,14 @@ byte 3:
350350
byte 4:
351351

352352
bit 7 6 5 4 3 2 1 0
353-
y15 y14 y13 y12 y11 y10 y8 y8
353+
. . . . . . y9 y8
354354

355355
byte 5:
356356

357357
bit 7 6 5 4 3 2 1 0
358358
y7 y6 y5 y4 y3 y2 y1 y0
359359

360-
y15..y0 = absolute y value (vertical)
360+
y9..y0 = absolute y value (vertical)
361361

362362

363363
4.2.2 Two finger touch

‎Documentation/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ and is between 256 and 4096 characters. It is defined in the file
11941194

11951195
libata.force= [LIBATA] Force configurations. The format is comma
11961196
separated list of "[ID:]VAL" where ID is
1197-
PORT[:DEVICE]. PORT and DEVICE are decimal numbers
1197+
PORT[.DEVICE]. PORT and DEVICE are decimal numbers
11981198
matching port, link or device. Basically, it matches
11991199
the ATA ID string printed on console by libata. If
12001200
the whole ID part is omitted, the last PORT and DEVICE

‎Documentation/spi/spidev_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static void transfer(int fd)
5858
};
5959

6060
ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);
61-
if (ret == 1)
61+
if (ret < 1)
6262
pabort("can't send spi message");
6363

6464
for (ret = 0; ret < ARRAY_SIZE(tx); ret++) {

‎Documentation/stable_kernel_rules.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@ Rules on what kind of patches are accepted, and which ones are not, into the
1818
- It cannot contain any "trivial" fixes in it (spelling changes,
1919
whitespace cleanups, etc).
2020
- It must follow the Documentation/SubmittingPatches rules.
21-
- It or an equivalent fix must already exist in Linus' tree. Quote the
22-
respective commit ID in Linus' tree in your patch submission to -stable.
21+
- It or an equivalent fix must already exist in Linus' tree (upstream).
2322

2423

2524
Procedure for submitting patches to the -stable tree:
2625

2726
- Send the patch, after verifying that it follows the above rules, to
28-
stable@kernel.org.
29-
- To have the patch automatically included in the stable tree, add the
30-
the tag
27+
stable@kernel.org. You must note the upstream commit ID in the changelog
28+
of your submission.
29+
- To have the patch automatically included in the stable tree, add the tag
3130
Cc: stable@kernel.org
3231
in the sign-off area. Once the patch is merged it will be applied to
3332
the stable tree without anything else needing to be done by the author

‎MAINTAINERS

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ F: lib/kobj*
19601960

19611961
DRM DRIVERS
19621962
M: David Airlie <airlied@linux.ie>
1963-
L: dri-devel@lists.sourceforge.net
1963+
L: dri-devel@lists.freedesktop.org
19641964
T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
19651965
S: Maintained
19661966
F: drivers/gpu/drm/
@@ -4482,17 +4482,17 @@ S: Maintained
44824482
F: drivers/ata/sata_promise.*
44834483

44844484
PS3 NETWORK SUPPORT
4485-
M: Geoff Levand <geoffrey.levand@am.sony.com>
4485+
M: Geoff Levand <geoff@infradead.org>
44864486
L: netdev@vger.kernel.org
44874487
L: cbe-oss-dev@ozlabs.org
4488-
S: Supported
4488+
S: Maintained
44894489
F: drivers/net/ps3_gelic_net.*
44904490

44914491
PS3 PLATFORM SUPPORT
4492-
M: Geoff Levand <geoffrey.levand@am.sony.com>
4492+
M: Geoff Levand <geoff@infradead.org>
44934493
L: linuxppc-dev@ozlabs.org
44944494
L: cbe-oss-dev@ozlabs.org
4495-
S: Supported
4495+
S: Maintained
44964496
F: arch/powerpc/boot/ps3*
44974497
F: arch/powerpc/include/asm/lv1call.h
44984498
F: arch/powerpc/include/asm/ps3*.h
@@ -4791,12 +4791,11 @@ F: drivers/s390/crypto/
47914791

47924792
S390 ZFCP DRIVER
47934793
M: Christof Schmitt <christof.schmitt@de.ibm.com>
4794-
M: Martin Peschke <mp3@de.ibm.com>
4794+
M: Swen Schillig <swen@vnet.ibm.com>
47954795
M: linux390@de.ibm.com
47964796
L: linux-s390@vger.kernel.org
47974797
W: http://www.ibm.com/developerworks/linux/linux390/
47984798
S: Supported
4799-
F: Documentation/s390/zfcpdump.txt
48004799
F: drivers/s390/scsi/zfcp_*
48014800

48024801
S390 IUCV NETWORK LAYER

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 2
22
PATCHLEVEL = 6
33
SUBLEVEL = 34
4-
EXTRAVERSION = -rc5
4+
EXTRAVERSION = -rc6
55
NAME = Sheep on Meth
66

77
# *DOCUMENTATION*

‎arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ config ARCH_REALVIEW
253253
select GENERIC_TIME
254254
select GENERIC_CLOCKEVENTS
255255
select ARCH_WANT_OPTIONAL_GPIOLIB
256+
select GPIO_PL061 if GPIOLIB
256257
help
257258
This enables support for ARM Ltd RealView boards.
258259

0 commit comments

Comments
 (0)