- Rebase to 7.1 (RHBZ#1649080):
  - Add compatibility support for strscpy()
  - Correct the manpage about the sort option
  - Add missing functions to libipset.map
  - configure.ac: Fix build regression on RHEL/CentOS/SL (Serhey Popovych)
  - Implement sorting for hash types in the ipset tool
  - Fix to list/save into file specified by option (reported by Isaac Good)
  - Introduction of new commands and protocol version 7, updated kernel include files
  - Add compatibility support for async in pernet_operations
  - Use more robust awk patterns to check for backward compatibility
  - Prepare the ipset tool to handle multiple protocol version
  - Fix warning message handlin
  - Correct to test null valued entry in hash:net6,port,net6 test
  - Library reworked to support embedding ipset completely
  - Add compatibility to support kvcalloc()
  - Validate string type attributes in attr2data() (Stefano Brivio)
  - manpage: Add comment about matching on destination MAC address (Stefano Brivio)
    (RHBZ#1649079)
  - Add compatibility to support is_zero_ether_addr()
  - Fix use-after-free in ipset_parse_name_compat() (Stefano Brivio) (RHBZ#1649073)
  - Fix leak in build_argv() on line parsing error (Stefano Brivio) (RHBZ#1649073)
  - Simplify return statement in ipset_mnl_query() (Stefano Brivio) (RHBZ#1649073)
  - tests/check_klog.sh: Try dmesg too, don't let shell terminate script (Stefano Brivio) 
- Fixes:
  - Fix all shellcheck warnings in init script (RHBZ#1649073)
  - Make error reporting consistent, introduce different severities (RHBZ#1649877)
  - While restoring, on invalid entries, remove them and retry (RHBZ#1650297)
  - Fix covscan SC2166 warning in init script (RHBZ#1649073)
  - Hardcode triggerin, triggerun versions for ipset-service (RHBZ#1646666)

- Rebase to 7.1 (RHBZ#1649080):
  - Add compatibility support for strscpy()
  - Correct the manpage about the sort option
  - Add missing functions to libipset.map
  - configure.ac: Fix build regression on RHEL/CentOS/SL (Serhey Popovych)
  - Implement sorting for hash types in the ipset tool
  - Fix to list/save into file specified by option (reported by Isaac Good)
  - Introduction of new commands and protocol version 7, updated kernel include files
  - Add compatibility support for async in pernet_operations
  - Use more robust awk patterns to check for backward compatibility
  - Prepare the ipset tool to handle multiple protocol version
  - Fix warning message handlin
  - Correct to test null valued entry in hash:net6,port,net6 test
  - Library reworked to support embedding ipset completely
  - Add compatibility to support kvcalloc()
  - Validate string type attributes in attr2data() (Stefano Brivio)
  - manpage: Add comment about matching on destination MAC address (Stefano Brivio)
    (RHBZ#1649079)
  - Add compatibility to support is_zero_ether_addr()
  - Fix use-after-free in ipset_parse_name_compat() (Stefano Brivio) (RHBZ#1649073)
  - Fix leak in build_argv() on line parsing error (Stefano Brivio) (RHBZ#1649073)
  - Simplify return statement in ipset_mnl_query() (Stefano Brivio) (RHBZ#1649073)
  - tests/check_klog.sh: Try dmesg too, don't let shell terminate script (Stefano Brivio) 
- Fixes:
  - Fix all shellcheck warnings in init script (RHBZ#1649073)
  - Make error reporting consistent, introduce different severities (RHBZ#1649877)
  - While restoring, on invalid entries, remove them and retry (RHBZ#1650297)
  - Fix covscan SC2166 warning in init script (RHBZ#1649073)
  - Hardcode triggerin, triggerun versions for ipset-service (RHBZ#1646666)