Merge tag 'v3.10.73' into update

This is the 3.10.73 stable release
2018-03-21 22:41:03 +01:00
parent aba762bde4 73895725a9
commit eff333fa3b
53 changed files with 494 additions and 193 deletions
@@ -71,7 +71,8 @@ enum {
 	/* data contains off-queue information when !WORK_STRUCT_PWQ */
 	WORK_OFFQ_FLAG_BASE	= WORK_STRUCT_COLOR_SHIFT,

-	WORK_OFFQ_CANCELING	= (1 << WORK_OFFQ_FLAG_BASE),
+	__WORK_OFFQ_CANCELING	= WORK_OFFQ_FLAG_BASE,
+	WORK_OFFQ_CANCELING	= (1 << __WORK_OFFQ_CANCELING),

 	/*
 	 * When a work item is off queue, its high bits point to the last