Thanks to PingPongRoot, it is possible to gain root access on the Samsung Galaxy S6 and Galaxy S6 edge without tripping KNOX. The problem, however, is that once the phone has been rooted and the system partition is modified, Galaxy S6 and S6 edge users will not be able to accept any OTA updates.

Installing any OTA update will likely result in an error during the installation process. This should not really be an issue for most users since Samsung has not yet rolled out any major update to the S6, but with Android 5.1 update for the handset around the corner, it will be a good idea for S6 owners to restore their phone to stock so that they can receive OTA updates on their handset when it lands.

Flashing the stock firmware on the Galaxy S6 and S6 edge is pretty easy, but requires the use of ODIN. While flashing the stock firmware will not erase user data, it is recommended that users still create a backup in case things to wrong.

It is recommended to do a factory reset before flashing the stock firmware by following the steps below. In case you don’t want to lose your installed apps and their data, do not factory reset the handset. However, keep in mind that the first boot after flashing the firmware will take a long time then.

Download ODIN, stock firmware and drivers

Step 1: Download ODIN and the correct firmware for your Galaxy S6 or S6 edge from below. Also, before you proceed to Step 2, make sure to download and install Samsung’s Smart Switch app on your PC since it will take care of the necessary driver required for the flashing procedure.

• ODIN 3.10
• Stock Galaxy S6 and S6 edge firmware (Registration required)
• Samsung Smart Switch

Note: Make sure to download the correct firmware for your Galaxy S6 or S6 edge. Make sure that you are downloading the firmware for the correct variant of the handset.

Step 2: Extract the firmware from the ZIP file and transfer it to your desktop.

Connect the device

Step 3: Switch off your Galaxy S6 or S6 edge and boot it into Fastboot/ODIN mode by pressing the Volume Down + Home + Power buttons simultaneously. Press the Volume Up button to skip past the warning screen. Then, connect the handset to your PC and open up ODIN.

Flashing the firmware

Step 4: If ODIN has detected your handset, it will display a COM number in one of the boxes. In case it does not, try disconnecting and reconnecting the handset again. Then, tap the AP button in ODIN and select the firmware that was transferred to the desktop of your PC in Step 2.

Step 5: Once the firmware has been verified by ODIN, press the Start  button to initiate the flashing procedure. After the firmware has been flashed, your Galaxy S6 or Galaxy S6 edge will automatically reboot into Android.

Congrats! You have successfully managed to restore the stock firmware on your Galaxy S6 or Galaxy S6 edge. You can now safely receive any OTA updates from Samsung.