Merge cc16f7402a ("ipv6: Align behavior across nexthops during path selection") into android16-6.12-lts

Steps on the way to 6.12.24 Resolves merge conflicts in: tools/testing/selftests/futex/functional/futex_wait_wouldblock.c Change-Id: I1c4fca16617ff6fbec20c586a416ac00e5837931 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2025-05-08 11:36:04 +00:00
parent 4c1ccdf129 cc16f7402a
commit 4aefb4fba6
38 changed files with 562 additions and 271 deletions
@@ -3990,6 +3990,11 @@ static int validate_unret(struct objtool_file *file, struct instruction *insn)
 			WARN_INSN(insn, "RET before UNTRAIN");
 			return 1;

+		case INSN_CONTEXT_SWITCH:
+			if (insn_func(insn))
+				break;
+			return 0;
+
 		case INSN_NOP:
 			if (insn->retpoline_safe)
 				return 0;