Question about upgrading from Lollipop to Marshmallow.

When Marshmallow is released Monday and downloadable. Is there a way to upgrade my N5 without loosing my storage data?