Comment 8 for bug 1685792

------- Comment From <email address hidden> 2017-05-16 02:51 EDT-------
Hello,

(In reply to comment #12)
> I'd like to submit and SRU for these four patches. However, the fourth
> patch attached to this bug seems to have changes since it landed in mainline.
>
> The fourth patch posted in comment #4 does apply cleanly to Ubuntu 17.04.
> However, a cherry pick of 17ed4c8f81da from upstream 4.12-rc1 fails. The
> cherry pick fails because your patch has:
>
> + OFFSET(PACA_SIBLING_PACA_PTRS, paca_struct, thread_sibling_pacas);
>
> However, the mainline version has changed to:
> + DEFINE(PACA_SIBLING_PACA_PTRS,
>
> Did you perform a backport of the fourth patch in the version you attached?
> If so, we can apply it to 17.04 that way, but I just want to confirm.

Yes, the attached patches are backports. Especially the fourth patch as it didn't apply cleanly precisely due to the reason you have alluded to.