A tech demo shows an octa-core Zen CPU edging out the Core i7-6900K in clock-to-clock benchmark tests. AMD "Naples" and Raven Ridge" platforms for servers and notebooks will not launch until 2017.
http://www.notebookcheck.net/AMD-announces-new-Zen-architecture-for-a-launch-by-Holiday-2016.172080.0.html