Merge branch 'master-next' into python3

* master-next:
  argv: move --nldebug option to common_argparse to avoid exception in ifreload
  debian: changelog: new 2.0.1-1 entry
  argv: add new command line argument --nldebug
  This commit adds the feature to change offloads for nics. Currently GRO, LRO GSO, TSO, UFO, TX and RX Offload are supported.

diff --cc debian/changelog
index 38b55ce1d47f1cfed92f37a5cf7208ad8186fee9,a62a32c74fc03f40b41e51b8eda4364fb00f89d9..efc3b3cb92d33419b99f4cef01a9e5bcdd4818ae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
-  -- Julien Fortin <julien@cumulusnetworks.com>  Tue, 01 Oct 2019 23:42:42 +0200
 +ifupdown2 (3.0.0-1) unstable; urgency=medium
 +
 +   * New. Enabled: python3 support
 +
++ -- Julien Fortin <julien@cumulusnetworks.com>  Tue, 31 Dec 2019 23:42:42 +0100
++
+ ifupdown2 (2.0.1-1) unstable; urgency=medium
+ 
+   * New argv option: --nldebug to print netlink debug message
+   * New: ethtool: nics (GRO, LRO GSO, TSO, UFO, TX and RX) offload attributes
+ 
+  -- Julien Fortin <julien@cumulusnetworks.com>  Tue, 31 Dec 2019 15:21:06 +0100
  
  ifupdown2 (2.0.0-1) unstable; urgency=medium
  

diff --cc ifupdown2/addons/ethtool.py
Simple merge

diff --cc ifupdown2/ifupdown/argv.py
Simple merge

diff --cc ifupdown2/ifupdown/ifupdownmain.py
Simple merge

diff --cc ifupdown2/ifupdown/main.py
Simple merge