From: David Herrmann <dh.herrmann@gmail.com>
Date: Tue, 14 Jul 2015 17:19:39 +0000 (+0200)
Subject: Merge commit 'refs/pull/436/head' of https://github.com/systemd/systemd
X-Git-Tag: v223~106
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=ca970016b7e5176e94eee3af24a70d5b3355018f

Merge commit 'refs/pull/436/head' of https://github.com/systemd/systemd

This merges:
  sd-netlink: respect attribute type flags

..fixing a conflict due to a typo fix.
---

ca970016b7e5176e94eee3af24a70d5b3355018f
diff --cc src/libsystemd/sd-netlink/netlink-internal.h
index 6f51ebe73db,4aa7583d031..4026e2c341b
--- a/src/libsystemd/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/sd-netlink/netlink-internal.h
@@@ -93,7 -93,9 +93,9 @@@ struct sd_netlink 
  };
  
  struct netlink_attribute {
 -        size_t offset; /* offset from hdr to attirubte */
 +        size_t offset; /* offset from hdr to attribute */
+         bool nested:1;
+         bool net_byteorder:1;
  };
  
  struct netlink_container {