At time of writing the affected usr_merge() function is identical on 2.12 and 3.0, so one patch can apply to both.
At time of writing the affected usr_merge() function is identical on 2.12 and 3.0, so one patch can apply to both.