Skip to content

Commit c5e40ee

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: net/bridge/br_mdb.c br_mdb.c conflict was a function call being removed to fix a bug in 'net' but whose signature was changed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 0528318 + c5dfd65 commit c5e40ee

File tree

544 files changed

+4152
-3347
lines changed

Some content is hidden

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

544 files changed

+4152
-3347
lines changed

‎.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
116116
Simon Kelley <simon@thekelleys.org.uk>
117117
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
118118
Stephen Hemminger <shemminger@osdl.org>
119+
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
119120
Sumit Semwal <sumit.semwal@ti.com>
120121
Tejun Heo <htejun@gmail.com>
121122
Thomas Graf <tgraf@suug.ch>
@@ -125,7 +126,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
125126
Uwe Kleine-König <ukl@pengutronix.de>
126127
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
127128
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
128-
Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
129+
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
130+
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
131+
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
129132
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
130133
Yusuke Goda <goda.yusuke@renesas.com>
131134
Gustavo Padovan <gustavo@las.ic.unicamp.br>

‎Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,10 +1234,8 @@ Description:
12341234
object is near the sensor, usually be observing
12351235
reflectivity of infrared or ultrasound emitted.
12361236
Often these sensors are unit less and as such conversion
1237-
to SI units is not possible. Where it is, the units should
1238-
be meters. If such a conversion is not possible, the reported
1239-
values should behave in the same way as a distance, i.e. lower
1240-
values indicate something is closer to the sensor.
1237+
to SI units is not possible. Higher proximity measurements
1238+
indicate closer objects, and vice versa.
12411239

12421240
What: /sys/.../iio:deviceX/in_illuminance_input
12431241
What: /sys/.../iio:deviceX/in_illuminance_raw

‎Documentation/DocBook/drm.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3383,7 +3383,7 @@ void intel_crt_init(struct drm_device *dev)
33833383
<td valign="top" >TBD</td>
33843384
</tr>
33853385
<tr>
3386-
<td rowspan="2" valign="top" >omap</td>
3386+
<td valign="top" >omap</td>
33873387
<td valign="top" >Generic</td>
33883388
<td valign="top" >“zorder”</td>
33893389
<td valign="top" >RANGE</td>

‎Documentation/arm/SPEAr/overview.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ Introduction
6060
Document Author
6161
---------------
6262

63-
Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics
63+
Viresh Kumar <vireshk@kernel.org>, (c) 2010-2012 ST Microelectronics

‎Documentation/device-mapper/cache.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,12 @@ cache metadata mode : ro if read-only, rw if read-write
258258
no further I/O will be permitted and the status will just
259259
contain the string 'Fail'. The userspace recovery tools
260260
should then be used.
261+
needs_check : 'needs_check' if set, '-' if not set
262+
A metadata operation has failed, resulting in the needs_check
263+
flag being set in the metadata's superblock. The metadata
264+
device must be deactivated and checked/repaired before the
265+
cache can be made fully operational again. '-' indicates
266+
needs_check is not set.
261267

262268
Messages
263269
--------

‎Documentation/device-mapper/thin-provisioning.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ ii) Status
296296
underlying device. When this is enabled when loading the table,
297297
it can get disabled if the underlying device doesn't support it.
298298

299-
ro|rw
299+
ro|rw|out_of_data_space
300300
If the pool encounters certain types of device failures it will
301301
drop into a read-only metadata mode in which no changes to
302302
the pool metadata (like allocating new blocks) are permitted.
@@ -314,6 +314,13 @@ ii) Status
314314
module parameter can be used to change this timeout -- it
315315
defaults to 60 seconds but may be disabled using a value of 0.
316316

317+
needs_check
318+
A metadata operation has failed, resulting in the needs_check
319+
flag being set in the metadata's superblock. The metadata
320+
device must be deactivated and checked/repaired before the
321+
thin-pool can be made fully operational again. '-' indicates
322+
needs_check is not set.
323+
317324
iii) Messages
318325

319326
create_thin <dev id>

‎Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ Optional properties:
6565
- edid: verbatim EDID data block describing attached display.
6666
- ddc: phandle describing the i2c bus handling the display data
6767
channel
68-
- port: A port node with endpoint definitions as defined in
68+
- port@[0-1]: Port nodes with endpoint definitions as defined in
6969
Documentation/devicetree/bindings/media/video-interfaces.txt.
70+
Port 0 is the input port connected to the IPU display interface,
71+
port 1 is the output port connected to a panel.
7072

7173
example:
7274

@@ -75,9 +77,29 @@ display@di0 {
7577
edid = [edid-data];
7678
interface-pix-fmt = "rgb24";
7779

78-
port {
80+
port@0 {
81+
reg = <0>;
82+
7983
display_in: endpoint {
8084
remote-endpoint = <&ipu_di0_disp0>;
8185
};
8286
};
87+
88+
port@1 {
89+
reg = <1>;
90+
91+
display_out: endpoint {
92+
remote-endpoint = <&panel_in>;
93+
};
94+
};
95+
};
96+
97+
panel {
98+
...
99+
100+
port {
101+
panel_in: endpoint {
102+
remote-endpoint = <&display_out>;
103+
};
104+
};
83105
};

‎Documentation/kbuild/makefiles.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,14 @@ When kbuild executes, the following steps are followed (roughly):
952952
$(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic
953953
mode) if this option is supported by $(AR).
954954

955+
ARCH_CPPFLAGS, ARCH_AFLAGS, ARCH_CFLAGS Overrides the kbuild defaults
956+
957+
These variables are appended to the KBUILD_CPPFLAGS,
958+
KBUILD_AFLAGS, and KBUILD_CFLAGS, respectively, after the
959+
top-level Makefile has set any other flags. This provides a
960+
means for an architecture to override the defaults.
961+
962+
955963
--- 6.2 Add prerequisites to archheaders:
956964

957965
The archheaders: rule is used to generate header files that

0 commit comments

Comments
 (0)