Who was the woman the Prophet, peace and blessings be upon him, divorced, and did he take her back?

Al-Bukhari narrated that the daughter of Al-Jawn said to the Prophet, peace and blessings be upon him, "I seek refuge in Allah from you." So he said to her, "You have sought refuge in the Mighty One; join your family." The correct name of this woman is Umaymah bint Al-Nu'man ibn Shurahil, and it has not been authentically reported that the Prophet, peace and blessings be upon him, returned to her again. Al-Hakim narrated from Qays ibn Zayd that the Prophet, peace and blessings be upon him, divorced Hafsah bint Umar, then he came and said, "Jibreel, peace be upon him, said to me: 'Take Hafsah back, for she is a frequent fasting person and a frequent worshipper at night, and she is your wife in Paradise.'"