Skip to content

Commit b35ad84

Browse files
committed
Merge branch 'core/entry' into x86/entry
Pick up generic entry code to migrate x86 over.
2 parents 7f6fa10 + 935ace2 commit b35ad84

File tree

663 files changed

+6069
-2780
lines changed

Some content is hidden

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

663 files changed

+6069
-2780
lines changed

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,16 @@ Frank Rowand <[email protected]> <[email protected]>
9090
Frank Zago <[email protected]>
9191
9292
93+
94+
95+
9396
Greg Kroah-Hartman <greg@echidna.(none)>
9497
Greg Kroah-Hartman <[email protected]>
9598
Greg Kroah-Hartman <[email protected]>
9699
97100
101+
102+
98103
Henk Vergonet <[email protected]>
99104
Henrik Kretzschmar <[email protected]>
100105
Henrik Rydberg <[email protected]>

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ Configuring the kernel
258258
Compiling the kernel
259259
--------------------
260260

261-
- Make sure you have at least gcc 4.6 available.
261+
- Make sure you have at least gcc 4.9 available.
262262
For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.
263263

264264
Please note that you can still run a.out user programs with this kernel.

Documentation/arm64/cpu-feature-registers.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ infrastructure:
171171

172172

173173
3) ID_AA64PFR1_EL1 - Processor Feature Register 1
174+
174175
+------------------------------+---------+---------+
175176
| Name | bits | visible |
176177
+------------------------------+---------+---------+
@@ -181,6 +182,7 @@ infrastructure:
181182

182183

183184
4) MIDR_EL1 - Main ID Register
185+
184186
+------------------------------+---------+---------+
185187
| Name | bits | visible |
186188
+------------------------------+---------+---------+

Documentation/block/bfq-iosched.rst

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -492,13 +492,6 @@ set max_budget to higher values than those to which BFQ would have set
492492
it with auto-tuning. An alternative way to achieve this goal is to
493493
just increase the value of timeout_sync, leaving max_budget equal to 0.
494494

495-
weights
496-
-------
497-
498-
Read-only parameter, used to show the weights of the currently active
499-
BFQ queues.
500-
501-
502495
4. Group scheduling with BFQ
503496
============================
504497

@@ -566,7 +559,7 @@ Parameters to set
566559
For each group, there is only the following parameter to set.
567560

568561
weight (namely blkio.bfq.weight or io.bfq-weight): the weight of the
569-
group inside its parent. Available values: 1..10000 (default 100). The
562+
group inside its parent. Available values: 1..1000 (default 100). The
570563
linear mapping between ioprio and weights, described at the beginning
571564
of the tunable section, is still valid, but all weights higher than
572565
IOPRIO_BE_NR*10 are mapped to ioprio 0.

Documentation/core-api/dma-api.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,14 @@ Returns the maximum size of a mapping for the device. The size parameter
204204
of the mapping functions like dma_map_single(), dma_map_page() and
205205
others should not be larger than the returned value.
206206

207+
::
208+
209+
bool
210+
dma_need_sync(struct device *dev, dma_addr_t dma_addr);
211+
212+
Returns %true if dma_sync_single_for_{device,cpu} calls are required to
213+
transfer memory ownership. Returns %false if those calls can be skipped.
214+
207215
::
208216

209217
unsigned long

Documentation/filesystems/overlayfs.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,8 @@ When the NFS export feature is enabled, all directory index entries are
560560
verified on mount time to check that upper file handles are not stale.
561561
This verification may cause significant overhead in some cases.
562562

563-
Note: the mount options index=off,nfs_export=on are conflicting and will
564-
result in an error.
563+
Note: the mount options index=off,nfs_export=on are conflicting for a
564+
read-write mount and will result in an error.
565565

566566

567567
Testsuite

Documentation/networking/arcnet.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ can set up your network then:
434434
ifconfig arc0 insight
435435
route add insight arc0
436436
route add freedom arc0 /* I would use the subnet here (like I said
437-
to to in "single protocol" above),
437+
to in "single protocol" above),
438438
but the rest of the subnet
439439
unfortunately lies across the PPP
440440
link on freedom, which confuses

Documentation/networking/ax25.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ AX.25
66

77
To use the amateur radio protocols within Linux you will need to get a
88
suitable copy of the AX.25 Utilities. More detailed information about
9-
AX.25, NET/ROM and ROSE, associated programs and and utilities can be
9+
AX.25, NET/ROM and ROSE, associated programs and utilities can be
1010
found on http://www.linux-ax25.org.
1111

1212
There is an active mailing list for discussing Linux amateur radio matters

Documentation/networking/can_ucan_protocol.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ UCAN_COMMAND_SET_BITTIMING
144144

145145
*Host2Dev; mandatory*
146146

147-
Setup bittiming by sending the the structure
147+
Setup bittiming by sending the structure
148148
``ucan_ctl_payload_t.cmd_set_bittiming`` (see ``struct bittiming`` for
149149
details)
150150

@@ -232,7 +232,7 @@ UCAN_IN_TX_COMPLETE
232232
zero
233233

234234
The CAN device has sent a message to the CAN bus. It answers with a
235-
list of of tuples <echo-ids, flags>.
235+
list of tuples <echo-ids, flags>.
236236

237237
The echo-id identifies the frame from (echos the id from a previous
238238
UCAN_OUT_TX message). The flag indicates the result of the

Documentation/networking/dsa/dsa.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Ethernet switch.
9595
Networking stack hooks
9696
----------------------
9797

98-
When a master netdev is used with DSA, a small hook is placed in in the
98+
When a master netdev is used with DSA, a small hook is placed in the
9999
networking stack is in order to have the DSA subsystem process the Ethernet
100100
switch specific tagging protocol. DSA accomplishes this by registering a
101101
specific (and fake) Ethernet type (later becoming ``skb->protocol``) with the

0 commit comments

Comments
 (0)