# Conflicts: # arch/x86/entry/entry_32.S # arch/x86/kernel/head_32.S # include/trace/events/rpcrdma.h # kernel/trace/trace_export.c
