Please double check my work, although the conflict resolutions were relatively trivial this time.
Especially interested for some of us is that now both networking tree have the fixes to objtool for gcc-8 which was causing tons of bogus warnings to be emitted. Recent upgrades to Fedora 28 would have noticed this... Anyways, everyone should have clean builds now.
