Skip to content

Commit 638d3c6

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: net/bridge/br_mdb.c Minor conflict in br_mdb.c, in 'net' we added a memset of the on-stack 'ip' variable whereas in 'net-next' we assign a new member 'vid'. Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 74fe61f + f760b87 commit 638d3c6

File tree

904 files changed

+28373
-16745
lines changed

Some content is hidden

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

904 files changed

+28373
-16745
lines changed

‎Documentation/arm/sunxi/README

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SunXi family
3636
+ User Manual
3737
http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf
3838

39-
- Allwinner A23
39+
- Allwinner A23 (sun8i)
4040
+ Datasheet
4141
http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf
4242
+ User Manual
@@ -55,7 +55,23 @@ SunXi family
5555
+ User Manual
5656
http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf
5757

58+
- Allwinner A33 (sun8i)
59+
+ Datasheet
60+
http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf
61+
+ User Manual
62+
http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf
63+
64+
- Allwinner H3 (sun8i)
65+
+ Datasheet
66+
http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf
67+
5868
* Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
5969
- Allwinner A80
6070
+ Datasheet
6171
http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf
72+
73+
* Octa ARM Cortex-A7 based SoCs
74+
- Allwinner A83T
75+
+ Not Supported
76+
+ Datasheet
77+
http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

‎Documentation/devicetree/bindings/arm/sunxi.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ using one of the following compatible strings:
99
allwinner,sun6i-a31
1010
allwinner,sun7i-a20
1111
allwinner,sun8i-a23
12+
allwinner,sun8i-a33
13+
allwinner,sun8i-h3
1214
allwinner,sun9i-a80

‎Documentation/devicetree/bindings/hwlock/hwlock.txt

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
Generic hwlock bindings
2+
=======================
3+
4+
Generic bindings that are common to all the hwlock platform specific driver
5+
implementations.
6+
7+
Please also look through the individual platform specific hwlock binding
8+
documentations for identifying any additional properties specific to that
9+
platform.
10+
11+
hwlock providers:
12+
=================
13+
14+
Required properties:
15+
- #hwlock-cells: Specifies the number of cells needed to represent a
16+
specific lock.
17+
18+
hwlock users:
19+
=============
20+
21+
Consumers that require specific hwlock(s) should specify them using the
22+
property "hwlocks", and an optional "hwlock-names" property.
23+
24+
Required properties:
25+
- hwlocks: List of phandle to a hwlock provider node and an
26+
associated hwlock args specifier as indicated by
27+
#hwlock-cells. The list can have just a single hwlock
28+
or multiple hwlocks, with each hwlock represented by
29+
a phandle and a corresponding args specifier.
30+
31+
Optional properties:
32+
- hwlock-names: List of hwlock name strings defined in the same order
33+
as the hwlocks, with one name per hwlock. Consumers can
34+
use the hwlock-names to match and get a specific hwlock.
35+
36+
37+
1. Example of a node using a single specific hwlock:
38+
39+
The following example has a node requesting a hwlock in the bank defined by
40+
the node hwlock1. hwlock1 is a hwlock provider with an argument specifier
41+
of length 1.
42+
43+
node {
44+
...
45+
hwlocks = <&hwlock1 2>;
46+
...
47+
};
48+
49+
2. Example of a node using multiple specific hwlocks:
50+
51+
The following example has a node requesting two hwlocks, a hwlock within
52+
the hwlock device node 'hwlock1' with #hwlock-cells value of 1, and another
53+
hwlock within the hwlock device node 'hwlock2' with #hwlock-cells value of 2.
54+
55+
node {
56+
...
57+
hwlocks = <&hwlock1 2>, <&hwlock2 0 3>;
58+
...
59+
};

‎Documentation/devicetree/bindings/hwlock/omap-hwspinlock.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
OMAP4+ HwSpinlock Driver
2+
========================
3+
4+
Required properties:
5+
- compatible: Should be "ti,omap4-hwspinlock" for
6+
OMAP44xx, OMAP54xx, AM33xx, AM43xx, DRA7xx SoCs
7+
- reg: Contains the hwspinlock module register address space
8+
(base address and length)
9+
- ti,hwmods: Name of the hwmod associated with the hwspinlock device
10+
- #hwlock-cells: Should be 1. The OMAP hwspinlock users will use a
11+
0-indexed relative hwlock number as the argument
12+
specifier value for requesting a specific hwspinlock
13+
within a hwspinlock bank.
14+
15+
Please look at the generic hwlock binding for usage information for consumers,
16+
"Documentation/devicetree/bindings/hwlock/hwlock.txt"
17+
18+
Example:
19+
20+
/* OMAP4 */
21+
hwspinlock: spinlock@4a0f6000 {
22+
compatible = "ti,omap4-hwspinlock";
23+
reg = <0x4a0f6000 0x1000>;
24+
ti,hwmods = "spinlock";
25+
#hwlock-cells = <1>;
26+
};

‎Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Qualcomm Hardware Mutex Block:
2+
3+
The hardware block provides mutexes utilized between different processors on
4+
the SoC as part of the communication protocol used by these processors.
5+
6+
- compatible:
7+
Usage: required
8+
Value type: <string>
9+
Definition: must be one of:
10+
"qcom,sfpb-mutex",
11+
"qcom,tcsr-mutex"
12+
13+
- syscon:
14+
Usage: required
15+
Value type: <prop-encoded-array>
16+
Definition: one cell containing:
17+
syscon phandle
18+
offset of the hwmutex block within the syscon
19+
stride of the hwmutex registers
20+
21+
- #hwlock-cells:
22+
Usage: required
23+
Value type: <u32>
24+
Definition: must be 1, the specified cell represent the lock id
25+
(hwlock standard property, see hwlock.txt)
26+
27+
Example:
28+
29+
tcsr_mutex_block: syscon@fd484000 {
30+
compatible = "syscon";
31+
reg = <0xfd484000 0x2000>;
32+
};
33+
34+
hwlock@fd484000 {
35+
compatible = "qcom,tcsr-mutex";
36+
syscon = <&tcsr_mutex_block 0 0x80>;
37+
38+
#hwlock-cells = <1>;
39+
};

‎Documentation/devicetree/bindings/hwlock/sirf,hwspinlock.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
SIRF Hardware spinlock device Binding
2+
-----------------------------------------------
3+
4+
Required properties :
5+
- compatible : shall contain only one of the following:
6+
"sirf,hwspinlock"
7+
8+
- reg : the register address of hwspinlock
9+
10+
- #hwlock-cells : hwlock users only use the hwlock id to represent a specific
11+
hwlock, so the number of cells should be <1> here.
12+
13+
Please look at the generic hwlock binding for usage information for consumers,
14+
"Documentation/devicetree/bindings/hwlock/hwlock.txt"
15+
16+
Example of hwlock provider:
17+
hwlock {
18+
compatible = "sirf,hwspinlock";
19+
reg = <0x13240000 0x00010000>;
20+
#hwlock-cells = <1>;
21+
};
22+
23+
Example of hwlock users:
24+
node {
25+
...
26+
hwlocks = <&hwlock 2>;
27+
...
28+
};

‎Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ of the EMIF IP and memory parts attached to it.
88
Required properties:
99
- compatible : Should be of the form "ti,emif-<ip-rev>" where <ip-rev>
1010
is the IP revision of the specific EMIF instance.
11+
For am437x should be ti,emif-am4372.
1112

1213
- phy-type : <u32> indicating the DDR phy type. Following are the
1314
allowed values

‎Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
TI Wakeup M3 Remoteproc Driver
2+
==============================
3+
4+
The TI AM33xx and AM43xx family of devices use a small Cortex M3 co-processor
5+
(commonly referred to as Wakeup M3 or CM3) to help with various low power tasks
6+
that cannot be controlled from the MPU. This CM3 processor requires a firmware
7+
binary to accomplish this. The wkup_m3 remoteproc driver handles the loading of
8+
the firmware and booting of the CM3.
9+
10+
Wkup M3 Device Node:
11+
====================
12+
A wkup_m3 device node is used to represent the Wakeup M3 processor instance
13+
within the SoC. It is added as a child node of the parent interconnect bus
14+
(l4_wkup) through which it is accessible to the MPU.
15+
16+
Required properties:
17+
--------------------
18+
- compatible: Should be one of,
19+
"ti,am3352-wkup-m3" for AM33xx SoCs
20+
"ti,am4372-wkup-m3" for AM43xx SoCs
21+
- reg: Should contain the address ranges for the two internal
22+
memory regions, UMEM and DMEM. The parent node should
23+
provide an appropriate ranges property for properly
24+
translating these into bus addresses.
25+
- reg-names: Contains the corresponding names for the two memory
26+
regions. These should be named "umem" & "dmem".
27+
- ti,hwmods: Name of the hwmod associated with the wkupm3 device.
28+
- ti,pm-firmware: Name of firmware file to be used for loading and
29+
booting the wkup_m3 remote processor.
30+
31+
Example:
32+
--------
33+
/* AM33xx */
34+
ocp {
35+
l4_wkup: l4_wkup@44c00000 {
36+
compatible = "am335-l4-wkup", "simple-bus";
37+
ranges = <0 0x44c00000 0x400000>;
38+
#address-cells = <1>;
39+
#size-cells = <1>;
40+
41+
wkup_m3: wkup_m3@100000 {
42+
compatible = "ti,am3352-wkup-m3";
43+
reg = <0x100000 0x4000>,
44+
<0x180000 0x2000>;
45+
reg-names = "umem", "dmem";
46+
ti,hwmods = "wkup_m3";
47+
ti,pm-firmware = "am335x-pm-firmware.elf";
48+
};
49+
};
50+
51+
...
52+
};

‎Documentation/devicetree/bindings/usb/atmel-usb.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ Atmel High-Speed USB device controller
7979

8080
Required properties:
8181
- compatible: Should be one of the following
82-
"at91sam9rl-udc"
83-
"at91sam9g45-udc"
84-
"sama5d3-udc"
82+
"atmel,at91sam9rl-udc"
83+
"atmel,at91sam9g45-udc"
84+
"atmel,sama5d3-udc"
8585
- reg: Address and length of the register set for the device
8686
- interrupts: Should contain usba interrupt
8787
- clocks: Should reference the peripheral and host clocks

‎Documentation/filesystems/caching/backend-api.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,29 @@ FS-Cache provides some utilities that a cache backend may make use of:
676676
as possible.
677677

678678

679+
(*) Indicate that a stale object was found and discarded:
680+
681+
void fscache_object_retrying_stale(struct fscache_object *object);
682+
683+
This is called to indicate that the lookup procedure found an object in
684+
the cache that the netfs decided was stale. The object has been
685+
discarded from the cache and the lookup will be performed again.
686+
687+
688+
(*) Indicate that the caching backend killed an object:
689+
690+
void fscache_object_mark_killed(struct fscache_object *object,
691+
enum fscache_why_object_killed why);
692+
693+
This is called to indicate that the cache backend preemptively killed an
694+
object. The why parameter should be set to indicate the reason:
695+
696+
FSCACHE_OBJECT_IS_STALE - the object was stale and needs discarding.
697+
FSCACHE_OBJECT_NO_SPACE - there was insufficient cache space
698+
FSCACHE_OBJECT_WAS_RETIRED - the object was retired when relinquished.
699+
FSCACHE_OBJECT_WAS_CULLED - the object was culled to make space.
700+
701+
679702
(*) Get and release references on a retrieval record:
680703

681704
void fscache_get_retrieval(struct fscache_retrieval *op);

‎Documentation/filesystems/caching/fscache.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,9 @@ proc files.
284284
enq=N Number of times async ops queued for processing
285285
can=N Number of async ops cancelled
286286
rej=N Number of async ops rejected due to object lookup/create failure
287+
ini=N Number of async ops initialised
287288
dfr=N Number of async ops queued for deferred release
288-
rel=N Number of async ops released
289+
rel=N Number of async ops released (should equal ini=N when idle)
289290
gc=N Number of deferred-release async ops garbage collected
290291
CacheOp alo=N Number of in-progress alloc_object() cache ops
291292
luo=N Number of in-progress lookup_object() cache ops
@@ -303,6 +304,10 @@ proc files.
303304
wrp=N Number of in-progress write_page() cache ops
304305
ucp=N Number of in-progress uncache_page() cache ops
305306
dsp=N Number of in-progress dissociate_pages() cache ops
307+
CacheEv nsp=N Number of object lookups/creations rejected due to lack of space
308+
stl=N Number of stale objects deleted
309+
rtr=N Number of objects retired when relinquished
310+
cul=N Number of objects culled
306311

307312

308313
(*) /proc/fs/fscache/histogram

‎Documentation/filesystems/dax.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ Usage
1818
-----
1919

2020
If you have a block device which supports DAX, you can make a filesystem
21-
on it as usual. When mounting it, use the -o dax option manually
22-
or add 'dax' to the options in /etc/fstab.
21+
on it as usual. The DAX code currently only supports files with a block
22+
size equal to your kernel's PAGE_SIZE, so you may need to specify a block
23+
size when creating the filesystem. When mounting it, use the "-o dax"
24+
option on the command line or add 'dax' to the options in /etc/fstab.
2325

2426

2527
Implementation Tips for Block Driver Writers

‎Documentation/filesystems/porting

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,3 +500,7 @@ in your dentry operations instead.
500500
dentry, it does not get nameidata at all and it gets called only when cookie
501501
is non-NULL. Note that link body isn't available anymore, so if you need it,
502502
store it as cookie.
503+
--
504+
[mandatory]
505+
__fd_install() & fd_install() can now sleep. Callers should not
506+
hold a spinlock or other resources that do not allow a schedule.

‎Documentation/hwmon/submitting-patches

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ increase the chances of your change being accepted.
8181

8282
* Provide a detect function if and only if a chip can be detected reliably.
8383

84+
* Only the following I2C addresses shall be probed: 0x18-0x1f, 0x28-0x2f,
85+
0x48-0x4f, 0x58, 0x5c, 0x73 and 0x77. Probing other addresses is strongly
86+
discouraged as it is known to cause trouble with other (non-hwmon) I2C
87+
chips. If your chip lives at an address which can't be probed then the
88+
device will have to be instantiated explicitly (which is always better
89+
anyway.)
90+
8491
* Avoid writing to chip registers in the detect function. If you have to write,
8592
only do it after you have already gathered enough data to be certain that the
8693
detection is going to be successful.

0 commit comments

Comments
 (0)