[10:54] <ahayzen> Hey, if i'm backporting a CVE fix to a previous release and there are merge conflicts. Should i resolve the conflicts in the simplest way or should i include commits that mean it can apply cleanly? Eg "blacklist" has been swapped for "blocklist" which is causing a conflict and another instance there is a bug fix in a later series that causes a conflict, should i include those commits before the CVE patches? or rewrite the CVE patch so that 
[10:54] <ahayzen> it applies on the old code?
[11:15] <mdeslaur> ahayzen: both ways are valid...depends on what you think the most sane approach is. if it's just the name of a variable, I would tend to change it. If there's a bug fix that changed a whole section, I would include it.
[11:16] <ahayzen> mdeslaur, ok thanks, one is a rename of a variable and one is an ifdef to fix a bug in s390x (which seems less relevant for a desktop package :-) )
[11:16] <mdeslaur> if you don't need to include that, then don't
[11:17] <mdeslaur> there's no good answer here :)
[11:17] <ahayzen> right i see :-)
[16:09] <teward> mdeslaur: backporting patches is... complex at times isn't it :P
[16:09] <mdeslaur> yeah, it can be pretty challenging :)