Merge git://git.infradead.org/users/dhowells/workq-2.6