Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 4 insertions, 14 deletions

diff --git a/Documentation/DocBook/media/v4l/media-types.xml b/Documentation/DocBook/media/v4l/media-types.xml
index 1af384250910..0ee0f3386cdf 100644
--- a/Documentation/DocBook/media/v4l/media-types.xml
+++ b/Documentation/DocBook/media/v4l/media-types.xml
@@ -57,10 +57,6 @@
             <entry>Connector for a RGB composite signal.</entry>
           </row>
           <row>
-            <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>
-            <entry>Connector for a test generator.</entry>
-          </row>
-          <row>
             <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>
             <entry>Camera video sensor entity.</entry>
           </row>
diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt b/Documentation/devicetree/bindings/regulator/tps65217.txt
index d18109657da6..4f05d208c95c 100644
--- a/Documentation/devicetree/bindings/regulator/tps65217.txt
+++ b/Documentation/devicetree/bindings/regulator/tps65217.txt
@@ -26,11 +26,7 @@ Example:
                 ti,pmic-shutdown-controller;
 
                 regulators {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
                         dcdc1_reg: dcdc1 {
-                                reg = <0>;
                                 regulator-min-microvolt = <900000>;
                                 regulator-max-microvolt = <1800000>;
                                 regulator-boot-on;
@@ -38,7 +34,6 @@ Example:
                         };
 
                         dcdc2_reg: dcdc2 {
-                                reg = <1>;
                                 regulator-min-microvolt = <900000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-boot-on;
@@ -46,7 +41,6 @@ Example:
                         };
 
                         dcdc3_reg: dcc3 {
-                                reg = <2>;
                                 regulator-min-microvolt = <900000>;
                                 regulator-max-microvolt = <1500000>;
                                 regulator-boot-on;
@@ -54,7 +48,6 @@ Example:
                         };
 
                         ldo1_reg: ldo1 {
-                                reg = <3>;
                                 regulator-min-microvolt = <1000000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-boot-on;
@@ -62,7 +55,6 @@ Example:
                         };
 
                         ldo2_reg: ldo2 {
-                                reg = <4>;
                                 regulator-min-microvolt = <900000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-boot-on;
@@ -70,7 +62,6 @@ Example:
                         };
 
                         ldo3_reg: ldo3 {
-                                reg = <5>;
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-boot-on;
@@ -78,7 +69,6 @@ Example:
                         };
 
                         ldo4_reg: ldo4 {
-                                reg = <6>;
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-boot-on;
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index 9f9ec9f76039..4e4b6f10d841 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -400,3 +400,7 @@ wm8350_wdt:
 nowayout: Watchdog cannot be stopped once started
         (default=kernel config parameter)
 -------------------------------------------------
+sun4v_wdt:
+timeout_ms: Watchdog timeout in milliseconds 1..180000, default=60000)
+nowayout: Watchdog cannot be stopped once started
+-------------------------------------------------