Dana White has said that GSP will be fighting the winner of Woodley and Demian Maia (Woodley versus Maia has not yet been confirmed) for his return bout. GSP has stated he would be ready to fight in October, which allows the UFC to book Woodley versus Maia in the mean time. This also likely allows GSP to get back into 170 shape as it looked like he was bulking up to take on Bisping at 185.
This is a surprise to me. I thought the idea of GSP fighting Woodley, Maia, Thompson, or any of the top 170 pound fighters was pretty far fetched given that each one of them pose a very real threat to GSP. Like other retired/aging fighters I thought GSP would only come back for legacy fights, or fights that he would be a favorite in. My thoughts were confirmed when he was booked against Bisping. While he is unlikely to be the favorite, GSP would have been a 2 weight class champ if he won.
Now that he is likely to fight Woodley or Maia I guess GSP really is coming back to re-establish himself as the best welterweight and top P4P fighter in the world. I would also anticipate GSP being the underdog in this match up.