Update includes July security patches along with a few bug fixes and stability improvements. Naturally, both S6 and S6 Edge are getting it. Update is not released in every country simultaneously. To make sure the upgrade is available to you, go to Settings > Software Update > Download Updates Manually.