The Ōnin War, and the shōgun's complacent attitude towards it, "sanctioned" private wars and skirmishes between the other daimyōs. No part of Japan escaped the violence. Although the battles in Kyoto had been abandoned, the war had spread to the rest of Japan. In Yamashiro Province, the Hatakeyama clan had split into two parts that fought each other to a standstill. This stalemate was to have serious consequences. In 1485, the peasantry and jizamurai  had had enough, and revolted. Setting up their own army , they forced the clan armies to leave the province. The Ikki became a powerful force, much more than simply an armed mob. By 1486 they had even set up a provisional government for Yamashiro province.:236-237 The Ikki would form and appear throughout other parts of Japan, such as Kaga Province, where a sect of the Jōdo Shinshū Buddhists, the Ikkō, started their own revolt during the Ōnin War after being enlisted by one of Kaga's most prominent warlords, Togashi Masachika. The Ikkō, who had a complex relationship with the Jōdo Shinshō leader Rennyo, appealed to the common peasants in their region, and inevitably formed the Ikkō-ikki. By 1488 the Ikkō-ikki of Kaga Province overthrew Masachika and took control of the province. After this they began building a fortified castle-cathedral along the Yodo River and used it as their headquarters. The Ikkō-ikki and the Yamashiro-ikki part of the general outbreak of civil war. Sansom states some refer to this as gekokujō , or a "disturbed social order". Sansom further states, "The frequent risings of the fifteenth century were expressions of popular discontent in which peasants took part".:235
Question: Who revolted
Answer: peasantry and jizamurai