Which stable GHC release is expected to have support for linear types?

[Wolfgang Jeltsch]

Hi!

The blog post on http://blog.tweag.io/posts/2017-03-13-linear-types.html
says, “We are targeting a merge by the time of the 8.4 release of GHC.”
Does this mean that GHC 8.4 is expected to have support for linear
types, or does it mean that the merge should happen after a GHC 8.4
branch has been forked off from the HEAD branch, so that only GHC 8.6
will have support for linear types?

All the best,
Wolfgang