IBRS and IBPB patches are what will be delayed and maybe never merged. Linus reckons that the Retpoline code will be quite sufficient.
Reply on news.ycombinator.com