From: Arnaldo Carvalho de Melo Date: Mon, 3 Aug 2020 12:37:31 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf/core X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b1aa3db2c13ec0c63a73bd8fc5dfbfb112e3ff56;p=linux.git Merge remote-tracking branch 'torvalds/master' into perf/core Minor conflict in tools/perf/arch/arm/util/auxtrace.c as one fix there was cherry-picked for the last perf/urgent pull req to Linus, so was already there. Signed-off-by: Arnaldo Carvalho de Melo --- b1aa3db2c13ec0c63a73bd8fc5dfbfb112e3ff56