New upstream version 1.40.10 upstream/1.40.10

7 files changed, 130 insertions, 67 deletions

diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml
index 0d73ca72..c8ccbd52 100644
--- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml
+++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml
@@ -100,6 +100,9 @@ that the user made these changes intentionally outside of NetworkManager).
 Reapply can make the applied-connection different from the
 settings-connection, just like updating the settings-connection can make
 them different.
+</para><para>
+Since 1.42, 1.40.10, "preserve-external-ip" flag (0x1) is supported to not
+remove externally added IP addresses and routes on the device during reapply.
 </para>
 <variablelist role="params">
 <varlistentry>
@@ -117,7 +120,7 @@ If non-zero, the current version id of the applied-connection must match. The cu
 <varlistentry>
   <term><literal>IN u <parameter>flags</parameter></literal>:</term>
   <listitem><para>
-Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.
+Flags which would modify the behavior of the Reapply call. Invalid flags are rejected.
 </para></listitem>
 </varlistentry>
 </variablelist>
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index 257f6bde..52186b6b 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -508,6 +508,7 @@
     <keyword type="enum" name="enum NMActivationStateFlags" link="nm-dbus-types.html#NMActivationStateFlags"/>
     <keyword type="enum" name="enum NMSettingsAddConnection2Flags" link="nm-dbus-types.html#NMSettingsAddConnection2Flags"/>
     <keyword type="enum" name="enum NMSettingsUpdate2Flags" link="nm-dbus-types.html#NMSettingsUpdate2Flags"/>
+    <keyword type="enum" name="enum NMDeviceReapplyFlags" link="nm-dbus-types.html#NMDeviceReapplyFlags"/>
     <keyword type="enum" name="enum NMTernary" link="nm-dbus-types.html#NMTernary"/>
     <keyword type="enum" name="enum NMManagerReloadFlags" link="nm-dbus-types.html#NMManagerReloadFlags"/>
     <keyword type="enum" name="enum NMDeviceInterfaceFlags" link="nm-dbus-types.html#NMDeviceInterfaceFlags"/>
@@ -811,54 +812,56 @@
     <keyword type="constant" name="NM_SETTINGS_UPDATE2_FLAG_VOLATILE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.29.4.2.1.4.6.1.1id-1.4.17.2.29.4.2.1.4.6.1.2"/>
     <keyword type="constant" name="NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.29.4.2.1.4.7.1.1id-1.4.17.2.29.4.2.1.4.7.1.2"/>
     <keyword type="constant" name="NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.29.4.2.1.4.8.1.1id-1.4.17.2.29.4.2.1.4.8.1.2"/>
-    <keyword type="constant" name="NM_TERNARY_DEFAULT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.30.4.2.1.4.1.1.1id-1.4.17.2.30.4.2.1.4.1.1.2"/>
-    <keyword type="constant" name="NM_TERNARY_FALSE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.30.4.2.1.4.2.1.1id-1.4.17.2.30.4.2.1.4.2.1.2"/>
-    <keyword type="constant" name="NM_TERNARY_TRUE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.30.4.2.1.4.3.1.1id-1.4.17.2.30.4.2.1.4.3.1.2"/>
-    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.1.1.1id-1.4.17.2.31.4.2.1.4.1.1.2"/>
-    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_CONF" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.2.1.1id-1.4.17.2.31.4.2.1.4.2.1.2"/>
-    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_DNS_RC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.3.1.1id-1.4.17.2.31.4.2.1.4.3.1.2"/>
-    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_DNS_FULL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.4.1.1id-1.4.17.2.31.4.2.1.4.4.1.2"/>
-    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_ALL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.5.1.1id-1.4.17.2.31.4.2.1.4.5.1.2"/>
-    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.1.1.1id-1.4.17.2.32.4.2.1.4.1.1.2"/>
-    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_UP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.2.1.1id-1.4.17.2.32.4.2.1.4.2.1.2"/>
-    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_LOWER_UP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.3.1.1id-1.4.17.2.32.4.2.1.4.3.1.2"/>
-    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_PROMISC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.4.1.1id-1.4.17.2.32.4.2.1.4.4.1.2"/>
-    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_CARRIER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.5.1.1id-1.4.17.2.32.4.2.1.4.5.1.2"/>
-    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.6.1.1id-1.4.17.2.32.4.2.1.4.6.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.1.1.1id-1.4.17.2.33.4.2.1.4.1.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.2.1.1id-1.4.17.2.33.4.2.1.4.2.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.3.1.1id-1.4.17.2.33.4.2.1.4.3.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.4.1.1id-1.4.17.2.33.4.2.1.4.4.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.5.1.1id-1.4.17.2.33.4.2.1.4.5.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_SLEEP_WAKE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.6.1.1id-1.4.17.2.33.4.2.1.4.6.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_NETWORK_CONTROL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.7.1.1id-1.4.17.2.33.4.2.1.4.7.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.8.1.1id-1.4.17.2.33.4.2.1.4.8.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.9.1.1id-1.4.17.2.33.4.2.1.4.9.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.10.1.1id-1.4.17.2.33.4.2.1.4.10.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.11.1.1id-1.4.17.2.33.4.2.1.4.11.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.12.1.1id-1.4.17.2.33.4.2.1.4.12.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.13.1.1id-1.4.17.2.33.4.2.1.4.13.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_RELOAD" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.14.1.1id-1.4.17.2.33.4.2.1.4.14.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.15.1.1id-1.4.17.2.33.4.2.1.4.15.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.16.1.1id-1.4.17.2.33.4.2.1.4.16.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.17.1.1id-1.4.17.2.33.4.2.1.4.17.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SCAN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.18.1.1id-1.4.17.2.33.4.2.1.4.18.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.1.1.1id-1.4.17.2.34.4.2.1.4.1.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_YES" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.2.1.1id-1.4.17.2.34.4.2.1.4.2.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_AUTH" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.3.1.1id-1.4.17.2.34.4.2.1.4.3.1.2"/>
-    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_NO" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.4.1.1id-1.4.17.2.34.4.2.1.4.4.1.2"/>
-    <keyword type="constant" name="NM_RADIO_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.35.4.2.1.4.1.1.1id-1.4.17.2.35.4.2.1.4.1.1.2"/>
-    <keyword type="constant" name="NM_RADIO_FLAG_WLAN_AVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.35.4.2.1.4.2.1.1id-1.4.17.2.35.4.2.1.4.2.1.2"/>
-    <keyword type="constant" name="NM_RADIO_FLAG_WWAN_AVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.35.4.2.1.4.3.1.1id-1.4.17.2.35.4.2.1.4.3.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.1.1.1id-1.4.17.2.36.4.2.1.4.1.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_DISABLED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.2.1.1id-1.4.17.2.36.4.2.1.4.2.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_ENABLED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.3.1.1id-1.4.17.2.36.4.2.1.4.3.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_ALSO_WITHOUT_SYSCTL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.4.1.1id-1.4.17.2.36.4.2.1.4.4.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_ALSO_WITHOUT_DEFAULT_ROUTE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.5.1.1id-1.4.17.2.36.4.2.1.4.5.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_SIGNAL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.6.1.1id-1.4.17.2.36.4.2.1.4.6.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_SUBFLOW" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.7.1.1id-1.4.17.2.36.4.2.1.4.7.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_BACKUP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.8.1.1id-1.4.17.2.36.4.2.1.4.8.1.2"/>
-    <keyword type="constant" name="NM_MPTCP_FLAGS_FULLMESH" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.9.1.1id-1.4.17.2.36.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_REAPPLY_FLAGS_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.30.4.2.1.4.1.1.1id-1.4.17.2.30.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_REAPPLY_FLAGS_PRESERVE_EXTERNAL_IP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.30.4.2.1.4.2.1.1id-1.4.17.2.30.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_TERNARY_DEFAULT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.1.1.1id-1.4.17.2.31.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_TERNARY_FALSE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.2.1.1id-1.4.17.2.31.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_TERNARY_TRUE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.31.4.2.1.4.3.1.1id-1.4.17.2.31.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.1.1.1id-1.4.17.2.32.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_CONF" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.2.1.1id-1.4.17.2.32.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_DNS_RC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.3.1.1id-1.4.17.2.32.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_DNS_FULL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.4.1.1id-1.4.17.2.32.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_MANAGER_RELOAD_FLAG_ALL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.32.4.2.1.4.5.1.1id-1.4.17.2.32.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.1.1.1id-1.4.17.2.33.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_UP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.2.1.1id-1.4.17.2.33.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_LOWER_UP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.3.1.1id-1.4.17.2.33.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_PROMISC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.4.1.1id-1.4.17.2.33.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_CARRIER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.5.1.1id-1.4.17.2.33.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.33.4.2.1.4.6.1.1id-1.4.17.2.33.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.1.1.1id-1.4.17.2.34.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.2.1.1id-1.4.17.2.34.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.3.1.1id-1.4.17.2.34.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.4.1.1id-1.4.17.2.34.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.5.1.1id-1.4.17.2.34.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SLEEP_WAKE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.6.1.1id-1.4.17.2.34.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_NETWORK_CONTROL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.7.1.1id-1.4.17.2.34.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.8.1.1id-1.4.17.2.34.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.9.1.1id-1.4.17.2.34.4.2.1.4.9.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.10.1.1id-1.4.17.2.34.4.2.1.4.10.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.11.1.1id-1.4.17.2.34.4.2.1.4.11.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.12.1.1id-1.4.17.2.34.4.2.1.4.12.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.13.1.1id-1.4.17.2.34.4.2.1.4.13.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RELOAD" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.14.1.1id-1.4.17.2.34.4.2.1.4.14.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_CHECKPOINT_ROLLBACK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.15.1.1id-1.4.17.2.34.4.2.1.4.15.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_STATISTICS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.16.1.1id-1.4.17.2.34.4.2.1.4.16.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.17.1.1id-1.4.17.2.34.4.2.1.4.17.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_WIFI_SCAN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.34.4.2.1.4.18.1.1id-1.4.17.2.34.4.2.1.4.18.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.35.4.2.1.4.1.1.1id-1.4.17.2.35.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_YES" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.35.4.2.1.4.2.1.1id-1.4.17.2.35.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_AUTH" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.35.4.2.1.4.3.1.1id-1.4.17.2.35.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_CLIENT_PERMISSION_RESULT_NO" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.35.4.2.1.4.4.1.1id-1.4.17.2.35.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_RADIO_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.1.1.1id-1.4.17.2.36.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_RADIO_FLAG_WLAN_AVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.2.1.1id-1.4.17.2.36.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_RADIO_FLAG_WWAN_AVAILABLE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.36.4.2.1.4.3.1.1id-1.4.17.2.36.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.1.1.1id-1.4.17.2.37.4.2.1.4.1.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_DISABLED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.2.1.1id-1.4.17.2.37.4.2.1.4.2.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_ENABLED" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.3.1.1id-1.4.17.2.37.4.2.1.4.3.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_ALSO_WITHOUT_SYSCTL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.4.1.1id-1.4.17.2.37.4.2.1.4.4.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_ALSO_WITHOUT_DEFAULT_ROUTE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.5.1.1id-1.4.17.2.37.4.2.1.4.5.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_SIGNAL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.6.1.1id-1.4.17.2.37.4.2.1.4.6.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_SUBFLOW" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.7.1.1id-1.4.17.2.37.4.2.1.4.7.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_BACKUP" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.8.1.1id-1.4.17.2.37.4.2.1.4.8.1.2"/>
+    <keyword type="constant" name="NM_MPTCP_FLAGS_FULLMESH" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.37.4.2.1.4.9.1.1id-1.4.17.2.37.4.2.1.4.9.1.2"/>
     <keyword type="constant" name="NM_VPN_SERVICE_STATE_UNKNOWN" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.6.3.2.3.4.2.1.4.1.1.1id-1.6.3.2.3.4.2.1.4.1.1.2"/>
     <keyword type="constant" name="NM_VPN_SERVICE_STATE_INIT" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.6.3.2.3.4.2.1.4.2.1.1id-1.6.3.2.3.4.2.1.4.2.1.2"/>
     <keyword type="constant" name="NM_VPN_SERVICE_STATE_SHUTDOWN" link="nm-vpn-dbus-types.htmlnm-vpn-dbus-types.html#id-1.6.3.2.3.4.2.1.4.3.1.1id-1.6.3.2.3.4.2.1.4.3.1.2"/>
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
index b1e492cb..f5026a1f 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html
@@ -129,6 +129,10 @@ Reapply can make the applied-connection different from the
 settings-connection, just like updating the settings-connection can make
 them different.
 </p>
+<p>
+Since 1.42, 1.40.10, "preserve-external-ip" flag (0x1) is supported to not
+remove externally added IP addresses and routes on the device during reapply.
+</p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
 <col align="left" valign="top">
@@ -150,7 +154,7 @@ If non-zero, the current version id of the applied-connection must match. The cu
 <tr>
 <td><p><span class="term"><code class="literal">IN u <em class="parameter"><code>flags</code></em></code>:</span></p></td>
 <td><p>
-Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.
+Flags which would modify the behavior of the Reapply call. Invalid flags are rejected.
 </p></td>
 </tr>
 </tbody>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 6c1324c1..240e61e6 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -16,7 +16,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for NetworkManager 1.40.8
+      for NetworkManager 1.40.10
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://networkmanager.dev/docs/api/latest/" target="_top">https://networkmanager.dev/docs/api/latest/</a>.
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index 15c9933b..d1897057 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -1123,9 +1123,9 @@
 </dt>
 <dt id="ientry-id-1.4.17.2.24.2">NMCheckpointCreateFlags, <a class="indexterm" href="nm-dbus-types.html#NMCheckpointCreateFlags">enum NMCheckpointCreateFlags</a>
 </dt>
-<dt id="ientry-id-1.4.17.2.33.2">NMClientPermission, <a class="indexterm" href="nm-dbus-types.html#NMClientPermission">enum NMClientPermission</a>
+<dt id="ientry-id-1.4.17.2.34.2">NMClientPermission, <a class="indexterm" href="nm-dbus-types.html#NMClientPermission">enum NMClientPermission</a>
 </dt>
-<dt id="ientry-id-1.4.17.2.34.2">NMClientPermissionResult, <a class="indexterm" href="nm-dbus-types.html#NMClientPermissionResult">enum NMClientPermissionResult</a>
+<dt id="ientry-id-1.4.17.2.35.2">NMClientPermissionResult, <a class="indexterm" href="nm-dbus-types.html#NMClientPermissionResult">enum NMClientPermissionResult</a>
 </dt>
 <dt id="ientry-id-1.4.17.2.18.2">NMConnectionMultiConnect, <a class="indexterm" href="nm-dbus-types.html#NMConnectionMultiConnect">enum NMConnectionMultiConnect</a>
 </dt>
@@ -1133,10 +1133,12 @@
 </dt>
 <dt id="ientry-id-1.4.17.2.7.2">NMDeviceCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceCapabilities">enum NMDeviceCapabilities</a>
 </dt>
-<dt id="ientry-id-1.4.17.2.32.2">NMDeviceInterfaceFlags, <a class="indexterm" href="nm-dbus-types.html#NMDeviceInterfaceFlags">enum NMDeviceInterfaceFlags</a>
+<dt id="ientry-id-1.4.17.2.33.2">NMDeviceInterfaceFlags, <a class="indexterm" href="nm-dbus-types.html#NMDeviceInterfaceFlags">enum NMDeviceInterfaceFlags</a>
 </dt>
 <dt id="ientry-id-1.4.17.2.13.2">NMDeviceModemCapabilities, <a class="indexterm" href="nm-dbus-types.html#NMDeviceModemCapabilities">enum NMDeviceModemCapabilities</a>
 </dt>
+<dt id="ientry-id-1.4.17.2.30.2">NMDeviceReapplyFlags, <a class="indexterm" href="nm-dbus-types.html#NMDeviceReapplyFlags">enum NMDeviceReapplyFlags</a>
+</dt>
 <dt id="ientry-id-1.4.17.2.15.2">NMDeviceState, <a class="indexterm" href="nm-dbus-types.html#NMDeviceState">enum NMDeviceState</a>
 </dt>
 <dt id="ientry-id-1.4.17.2.16.2">NMDeviceStateReason, <a class="indexterm" href="nm-dbus-types.html#NMDeviceStateReason">enum NMDeviceStateReason</a>
@@ -1147,13 +1149,13 @@
 </dt>
 <dt id="ientry-id-1.4.17.2.23.2">NMIPTunnelMode, <a class="indexterm" href="nm-dbus-types.html#NMIPTunnelMode">enum NMIPTunnelMode</a>
 </dt>
-<dt id="ientry-id-1.4.17.2.31.2">NMManagerReloadFlags, <a class="indexterm" href="nm-dbus-types.html#NMManagerReloadFlags">enum NMManagerReloadFlags</a>
+<dt id="ientry-id-1.4.17.2.32.2">NMManagerReloadFlags, <a class="indexterm" href="nm-dbus-types.html#NMManagerReloadFlags">enum NMManagerReloadFlags</a>
 </dt>
 <dt id="ientry-id-1.4.17.2.17.2">NMMetered, <a class="indexterm" href="nm-dbus-types.html#NMMetered">enum NMMetered</a>
 </dt>
-<dt id="ientry-id-1.4.17.2.36.2">NMMptcpFlags, <a class="indexterm" href="nm-dbus-types.html#NMMptcpFlags">enum NMMptcpFlags</a>
+<dt id="ientry-id-1.4.17.2.37.2">NMMptcpFlags, <a class="indexterm" href="nm-dbus-types.html#NMMptcpFlags">enum NMMptcpFlags</a>
 </dt>
-<dt id="ientry-id-1.4.17.2.35.2">NMRadioFlags, <a class="indexterm" href="nm-dbus-types.html#NMRadioFlags">enum NMRadioFlags</a>
+<dt id="ientry-id-1.4.17.2.36.2">NMRadioFlags, <a class="indexterm" href="nm-dbus-types.html#NMRadioFlags">enum NMRadioFlags</a>
 </dt>
 <dt id="ientry-id-1.4.17.2.25.2">NMRollbackResult, <a class="indexterm" href="nm-dbus-types.html#NMRollbackResult">enum NMRollbackResult</a>
 </dt>
@@ -1169,7 +1171,7 @@
 </dt>
 <dt id="ientry-id-1.4.17.2.4.2">NMState, <a class="indexterm" href="nm-dbus-types.html#NMState">enum NMState</a>
 </dt>
-<dt id="ientry-id-1.4.17.2.30.2">NMTernary, <a class="indexterm" href="nm-dbus-types.html#NMTernary">enum NMTernary</a>
+<dt id="ientry-id-1.4.17.2.31.2">NMTernary, <a class="indexterm" href="nm-dbus-types.html#NMTernary">enum NMTernary</a>
 </dt>
 <dt id="ientry-id-1.6.3.2.4.2">NMVpnConnectionState, <a class="indexterm" href="nm-vpn-dbus-types.html#NMVpnConnectionState">enum NMVpnConnectionState</a>
 </dt>
diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html
index 0580b439..892a1924 100644
--- a/docs/api/html/nm-dbus-types.html
+++ b/docs/api/html/nm-dbus-types.html
@@ -3071,7 +3071,7 @@
 <hr>
 <div class="refsect2">
 <a name="NMMetered"></a><h3>enum NMMetered</h3>
-<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.</p>
+<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the <a href="/usr/share/gtk-doc/html/libnm/NMDevice.html#NMDevice-struct">NMDevice</a> at a given moment.</p>
 <p>For the connection profile only NM_METERED_UNKNOWN, NM_METERED_NO and NM_METERED_YES are allowed.</p>
 <p>The device's metered state at runtime is determined by the profile which is currently active. If the profile explicitly specifies NM_METERED_NO or NM_METERED_YES, then the device's metered state is as such. If the connection profile leaves it undecided at NM_METERED_UNKNOWN (the default), then NetworkManager tries to guess the metered state, for example based on the device type or on DHCP options (like Android devices exposing a "ANDROID_METERED" DHCP vendor option). This then leads to either NM_METERED_GUESS_NO or NM_METERED_GUESS_YES.</p>
 <p>Most applications probably should treat the runtime state NM_METERED_GUESS_YES like NM_METERED_YES, and all other states as not metered.</p>
@@ -4619,12 +4619,63 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMDeviceReapplyFlags"></a><h3>enum NMDeviceReapplyFlags</h3>
+<p>Flags for the Reapply() D-Bus call of a device and nm_device_reapply_async().</p>
+<p>Since: 1.42, 1.40.10</p>
+<p>On 1.40.10+, no GFlags type is created.</p>
+<p></p>
+<div class="refsect3">
+<a name="id-1.4.17.2.30.4"></a><h4>Values</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col width="100px" class="enum_members_value">
+<col class="enum_members_description">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_REAPPLY_FLAGS_NONE</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>no flag set.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+<tr>
+<td class="enum_member_name">
+<p>NM_DEVICE_REAPPLY_FLAGS_PRESERVE_EXTERNAL_IP</p>
+<p></p>
+</td>
+<td class="enum_member_value">
+<p>= <code class="literal">0x1</code></p>
+<p></p>
+</td>
+<td class="enum_member_description">
+<p>during reapply, preserve external IP addresses and routes.</p>
+<p></p>
+</td>
+<td class="auto-generated"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMTernary"></a><h3>enum NMTernary</h3>
 <p>An boolean value that can be overridden by a default.</p>
 <p>Since: 1.14</p>
 <p></p>
 <div class="refsect3">
-<a name="id-1.4.17.2.30.4"></a><h4>Values</h4>
+<a name="id-1.4.17.2.31.4"></a><h4>Values</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -4689,7 +4740,7 @@
 <p>Since: 1.22</p>
 <p></p>
 <div class="refsect3">
-<a name="id-1.4.17.2.31.4"></a><h4>Values</h4>
+<a name="id-1.4.17.2.32.4"></a><h4>Values</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -4784,7 +4835,7 @@
 <p>Since: 1.22</p>
 <p></p>
 <div class="refsect3">
-<a name="id-1.4.17.2.32.4"></a><h4>Values</h4>
+<a name="id-1.4.17.2.33.4"></a><h4>Values</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -4893,7 +4944,7 @@
 <p><a class="link" href="nm-dbus-types.html#NMClientPermission" title="enum NMClientPermission">NMClientPermission</a> values indicate various permissions that NetworkManager clients can obtain to perform certain tasks on behalf of the current user.</p>
 <p></p>
 <div class="refsect3">
-<a name="id-1.4.17.2.33.4"></a><h4>Values</h4>
+<a name="id-1.4.17.2.34.4"></a><h4>Values</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -5182,7 +5233,7 @@
 <p><a class="link" href="nm-dbus-types.html#NMClientPermissionResult" title="enum NMClientPermissionResult">NMClientPermissionResult</a> values indicate what authorizations and permissions the user requires to obtain a given <a class="link" href="nm-dbus-types.html#NMClientPermission" title="enum NMClientPermission">NMClientPermission</a></p>
 <p></p>
 <div class="refsect3">
-<a name="id-1.4.17.2.34.4"></a><h4>Values</h4>
+<a name="id-1.4.17.2.35.4"></a><h4>Values</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -5262,7 +5313,7 @@
 <p>Since: 1.38</p>
 <p></p>
 <div class="refsect3">
-<a name="id-1.4.17.2.35.4"></a><h4>Values</h4>
+<a name="id-1.4.17.2.36.4"></a><h4>Values</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
@@ -5326,7 +5377,7 @@
 <p>Since: 1.40</p>
 <p></p>
 <div class="refsect3">
-<a name="id-1.4.17.2.36.4"></a><h4>Values</h4>
+<a name="id-1.4.17.2.37.4"></a><h4>Values</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
 <colgroup>
 <col width="300px" class="enum_members_name">
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 19d25d0a..5faa4fff 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.40.8
+1.40.10