Select the types of activity you want to include in your feed.
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] cio: Fix handling of interrupt for csch(). [S390] page_mkclean data corruption.
···221221222222 cdev_irb = &cdev->private->irb;223223224224+ /*225225+ * If the clear function had been performed, all formerly pending226226+ * status at the subchannel has been cleared and we must not pass227227+ * intermediate accumulated status to the device driver.228228+ */229229+ if (irb->scsw.fctl & SCSW_FCTL_CLEAR_FUNC)230230+ memset(&cdev->private->irb, 0, sizeof(struct irb));231231+224232 /* Copy bits which are valid only for the start function. */225233 if (irb->scsw.fctl & SCSW_FCTL_START_FUNC) {226234 /* Copy key. */
+2-2
mm/rmap.c
···498498 struct address_space *mapping = page_mapping(page);499499 if (mapping)500500 ret = page_mkclean_file(mapping, page);501501+ if (page_test_and_clear_dirty(page))502502+ ret = 1;501503 }502502- if (page_test_and_clear_dirty(page))503503- ret = 1;504504505505 return ret;506506}