A mismerge for this patch means a serious performance degradation occurs if
you don't also apply the patch mm-fix_kswapd_inherit_prio.patch in the fixes
directory.

Sorry about any inconvenience.