On Sun, 19 May 2019 10:55:52 +0200 Thomas Haller <[email protected]> wrote:
> On Sat, 2019-05-18 at 21:08 -0500, Robby Workman wrote: > > The attached patch can be applied to master and 1.12 branches. > > It's specific to the hostname handling on Slackware, so it > > shouldn't affect anyone else. > > > > > > Merged to upstream. > > Since the patch only affects Slackware, I assume you know what you > want and handle compatiblity (preserve previous behavior) on upgrade > as you see fit :) Yep yep. :-) > master: > https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=e1df17e0acd14418608c2057ea4f49c31208053e > nm-1-18: > https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=065e810424372b5969bbf910cf39fb6fd5d0ce9e > nm-1-16: > https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=6160888e61d525552c8bdd0b64bfe137570daa83 > nm-1-14: > https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=fb8d30a3dd000edb8272e7a512181cb3998bee50 > nm-1-12: > https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=17709225eca69ae06860c3543fff6a93c0d2daf6 > > [FYI] You only asked for "master" and "nm-1-12", but all patches on > old-stable-branch "nm-1-$x" must also be present on "nm-1-$((x+2))"). > In other words, an older branch must be a strict subset of the patches > of the next-newer branch. That's why there is this chain of cherry- > picks. Yes, only nm-1-12 was mentioned because that's the only stable branch in existence at the time the patch (and commit message) was done. Sadly, I've been sitting on it this long. Thanks for understanding the intent :-) -RW _______________________________________________ networkmanager-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/networkmanager-list
