Skip to content

Commit 28596c9

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull "trivial tree" updates from Jiri Kosina: "Usual pile from trivial tree everyone is so eagerly waiting for" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Remove MN10300_PROC_MN2WS0038 mei: fix comments treewide: Fix typos in Kconfig kprobes: update jprobe_example.c for do_fork() change Documentation: change "&" to "and" in Documentation/applying-patches.txt Documentation: remove obsolete pcmcia-cs from Changes Documentation: update links in Changes Documentation: Docbook: Fix generated DocBook/kernel-api.xml score: Remove GENERIC_HAS_IOMAP gpio: fix 'CONFIG_GPIO_IRQCHIP' comments tty: doc: Fix grammar in serial/tty dma-debug: modify check_for_stack output treewide: fix errors in printk genirq: fix reference in devm_request_threaded_irq comment treewide: fix synchronize_rcu() in comments checkstack.pl: port to AArch64 doc: queue-sysfs: minor fixes init/do_mounts: better syntax description MIPS: fix comment spelling powerpc/simpleboot: fix comment ...
2 parents b6420eb + 7bb38d5 commit 28596c9

File tree

92 files changed

+125
-135
lines changed

Some content is hidden

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

92 files changed

+125
-135
lines changed

‎Documentation/ABI/testing/sysfs-class-net‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Description:
159159
lower-level interface protocol used. Ethernet devices will show
160160
a 'mtu' attribute value of 1500 unless changed.
161161

162-
What: /sys/calss/net/<iface>/netdev_group
162+
What: /sys/class/net/<iface>/netdev_group
163163
Date: January 2011
164164
KernelVersion: 2.6.39
165165
Contact: netdev@vger.kernel.org

‎Documentation/Changes‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -167,18 +167,11 @@ later is recommended, due to some significant improvements).
167167
PCMCIAutils
168168
-----------
169169

170-
PCMCIAutils replaces pcmcia-cs (see below). It properly sets up
170+
PCMCIAutils replaces pcmcia-cs. It properly sets up
171171
PCMCIA sockets at system startup and loads the appropriate modules
172172
for 16-bit PCMCIA devices if the kernel is modularized and the hotplug
173173
subsystem is used.
174174

175-
Pcmcia-cs
176-
---------
177-
178-
PCMCIA (PC Card) support is now partially implemented in the main
179-
kernel source. The "pcmciautils" package (see above) replaces pcmcia-cs
180-
for newest kernels.
181-
182175
Quota-tools
183176
-----------
184177

@@ -341,37 +334,33 @@ Pcmciautils
341334
-----------
342335
o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/>
343336

344-
Pcmcia-cs
345-
---------
346-
o <http://pcmcia-cs.sourceforge.net/>
347-
348337
Quota-tools
349338
----------
350339
o <http://sourceforge.net/projects/linuxquota/>
351340

352341
DocBook Stylesheets
353342
-------------------
354-
o <http://nwalsh.com/docbook/dsssl/>
343+
o <http://sourceforge.net/projects/docbook/files/docbook-dsssl/>
355344

356345
XMLTO XSLT Frontend
357346
-------------------
358347
o <http://cyberelk.net/tim/xmlto/>
359348

360349
Intel P6 microcode
361350
------------------
362-
o <http://www.urbanmyth.org/microcode/>
351+
o <https://downloadcenter.intel.com/>
363352

364353
udev
365354
----
366-
o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>
355+
o <http://www.freedesktop.org/software/systemd/man/udev.html>
367356

368357
FUSE
369358
----
370359
o <http://sourceforge.net/projects/fuse>
371360

372361
mcelog
373362
------
374-
o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/>
363+
o <http://www.mcelog.org/>
375364

376365
Networking
377366
**********

‎Documentation/CodingStyle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ the ones already enabled by DEBUG.
675675
Many subsystems have Kconfig debug options to turn on -DDEBUG in the
676676
corresponding Makefile; in other cases specific files #define DEBUG. And
677677
when a debug message should be unconditionally printed, such as if it is
678-
already inside a debug-related #ifdef secton, printk(KERN_DEBUG ...) can be
678+
already inside a debug-related #ifdef section, printk(KERN_DEBUG ...) can be
679679
used.
680680

681681

‎Documentation/applying-patches.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Common errors when patching
9494
---
9595
When patch applies a patch file it attempts to verify the sanity of the
9696
file in different ways.
97-
Checking that the file looks like a valid patch file & checking the code
97+
Checking that the file looks like a valid patch file and checking the code
9898
around the bits being modified matches the context provided in the patch are
9999
just two of the basic sanity checks patch does.
100100

‎Documentation/block/null_blk.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ nr_devices=[Number of devices]: Default: 2
4242
Number of block devices instantiated. They are instantiated as /dev/nullb0,
4343
etc.
4444

45-
irq_mode=[0-2]: Default: 1-Soft-irq
45+
irqmode=[0-2]: Default: 1-Soft-irq
4646
The completion mode used for completing IOs to the block-layer.
4747

4848
0: None.
@@ -53,7 +53,7 @@ irq_mode=[0-2]: Default: 1-Soft-irq
5353
completion.
5454

5555
completion_nsec=[ns]: Default: 10.000ns
56-
Combined with irq_mode=2 (timer). The time each completion event must wait.
56+
Combined with irqmode=2 (timer). The time each completion event must wait.
5757

5858
submit_queues=[0..nr_cpus]:
5959
The number of submission queues attached to the device driver. If unset, it

‎Documentation/block/queue-sysfs.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ read-write.
1111

1212
add_random (RW)
1313
----------------
14-
This file allows to trun off the disk entropy contribution. Default
14+
This file allows to turn off the disk entropy contribution. Default
1515
value of this file is '1'(on).
1616

1717
discard_granularity (RO)
@@ -72,7 +72,7 @@ Maximum segment size of the device.
7272

7373
minimum_io_size (RO)
7474
--------------------
75-
This is the smallest preferred io size reported by the device.
75+
This is the smallest preferred IO size reported by the device.
7676

7777
nomerges (RW)
7878
-------------
@@ -98,7 +98,7 @@ regulated by nr_requests.
9898

9999
optimal_io_size (RO)
100100
--------------------
101-
This is the optimal io size reported by the device.
101+
This is the optimal IO size reported by the device.
102102

103103
physical_block_size (RO)
104104
------------------------

‎Documentation/devicetree/bindings/clock/arm-integrator.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Clock bindings for ARM Integrator and Versatile Core Module clocks
22

3-
Auxilary Oscillator Clock
3+
Auxiliary Oscillator Clock
44

55
This is a configurable clock fed from a 24 MHz chrystal,
66
used for generating e.g. video clocks. It is located on the

‎Documentation/devicetree/bindings/crypto/fsl-sec6.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM).
2-
Currently Freescale powerpc chip C29X is embeded with SEC 6.
2+
Currently Freescale powerpc chip C29X is embedded with SEC 6.
33
SEC 6 device tree binding include:
44
-SEC 6 Node
55
-Job Ring Node

‎Documentation/devicetree/bindings/iio/adc/vf610-adc.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Required properties:
99
- interrupts: Should contain the interrupt for the device
1010
- clocks: The clock is needed by the ADC controller, ADC clock source is ipg clock.
1111
- clock-names: Must contain "adc", matching entry in the clocks property.
12-
- vref-supply: The regulator supply ADC refrence voltage.
12+
- vref-supply: The regulator supply ADC reference voltage.
1313

1414
Example:
1515
adc0: adc@4003b000 {

‎Documentation/devicetree/bindings/mfd/s2mps11.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ sub-node should be of the format as listed below.
4747

4848
regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us
4949

50-
BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explictly
50+
BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explicitly
5151
regulator-ramp-delay = <0> can be used for them to disable ramp delay.
5252
In the absence of the regulator-ramp-delay property, the default ramp
5353
delay will be used.

0 commit comments

Comments
 (0)