commit bf4367d790c514490896f29085d9fa3defa28513 Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Wed May 30 12:19:59 2018 +0200 Linux 4.14.46 commit 48aaff1bcde75b09429d780be4b57d25be4cab9a Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Wed May 30 11:41:46 2018 +0200 Revert "perf record: Fix crash in pipe mode" This reverts commit f766148e47d7d3b8a7128cae511971c0f793e38e which is commit ad46e48c65fa1f204fa29eaff1b91174d314a94b upstream. It breaks the build. Turns out we don't test perf on stable releases, we need to fix that :( Reported-by: Pavlos Parissis <pavlos.parissis@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> commit ec39812d211737fcd02248d4f8bab6bf77d542cb Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Wed May 30 11:53:49 2018 +0200 tools: sync up .h files with the repective arch and uapi .h files perf wants matching .h files otherwise it complains during the build process. As these files have been modified over the past few 4.14.y releases, they are out of sync, so fix that problem by properly copying the respective versions to the tools/ mirror copies. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> commit c0f1d9bfd913d8348773b4bf2ca95d2487493d78 Author: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Date: Tue Jan 30 11:00:52 2018 +0530 perf tools: Add trace/beauty/generated/ into .gitignore commit 2fe2230d4183d2c311bbb7b426491ac486216a16 upstream. No functionality changes. Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/20180130053053.13214-2-ravi.bangoria@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>