Changes in Makefile

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/drivers/gpu/trace/Makefile

9e8238020c5beba64e7ffafbb7ea0fb02fe68270 - Merge branch 'next' into for-linus

Sat, 08 Aug 2020 01:41:01 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.9 merge window. List of files: /linux/drivers/gpu/trace/Makefile

9b031c86506cef9acae45e61339fcf9deaabb793 - Merge branch 'elan-i2c' into next

Wed, 22 Jul 2020 04:02:33 +0200

Merge branch 'elan-i2c' into nextBring in update to Elan touchpad driver to support newer touchpads withhigher resolution. List of files: /linux/drivers/gpu/trace/Makefile

16ba7e312045cd5d32fba0156312b4303f200787 - Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus

Wed, 03 Jun 2020 22:23:52 +0200

Merge branches 'for-5.7/upstream-fixes', 'for-5.8/apple', 'for-5.8/asus', 'for-5.8/core', 'for-5.8/intel-ish', 'for-5.8/logitech', 'for-5.8/mcp2221' and 'for-5.8/multitouch' into for-linus List of files: /linux/drivers/gpu/trace/Makefile

d053cf0d771f6547cb0537759a9af63cf402908d - Merge branch 'for-5.8' into for-linus

Mon, 01 Jun 2020 10:15:16 +0200

Merge branch 'for-5.8' into for-linus List of files: /linux/drivers/gpu/trace/Makefile

1f422417945d08731e2915e0addb976f11b3a85a - Merge branch 'timers/drivers/timer-ti' into timers/drivers/next

Sat, 23 May 2020 00:01:13 +0200

Merge branch 'timers/drivers/timer-ti' into timers/drivers/next List of files: /linux/drivers/gpu/trace/Makefile

4aef2ec9022b217f74d0f4c9b84081f07cc223d9 - Merge branch 'kvm-amd-fixes' into HEAD

Wed, 13 May 2020 18:14:05 +0200

Merge branch 'kvm-amd-fixes' into HEAD List of files: /linux/drivers/gpu/trace/Makefile

68f0f2690e183306b52671a9ad09fb31808b0500 - Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

Mon, 11 May 2020 22:54:30 +0200

Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcuPull RCU updates from Paul McKenney: 1. Miscellaneous fixes. 2. kfree_rcu() updates. 3. Remove scheduler locking restriction 4. RCU-tasks update, including addition of RCU Tasks Trace for BPF use and RCU Tasks Rude. (This branch is on top of #3 due to overlap of changed code.) 5. RCU CPU stall warning updates. 6. Torture-test updates. List of files: /linux/drivers/gpu/trace/Makefile

4353dd3b70783ebbc83fcf12d9c0af3fbab0223b - Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core

Sat, 25 Apr 2020 10:25:02 +0200

Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/corePull EFI changes for v5.8 from Ard Biesheuvel:"- preliminary changes for RISC-V - add support for setting the resolution on the EFI framebuffer - simplify kernel image loading for arm64 - Move .bss into .data via the linker script instead of relying on symbol annotations. - Get rid of __pure getters to access global variables - Clean up the config table matching arrays"Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/trace/Makefile

36dbae9945322e660795e73ffc8ed8ae4f25d13d - Merge branch 'topic/nhlt' into for-next

Fri, 24 Apr 2020 08:22:16 +0200

Merge branch 'topic/nhlt' into for-nextMerge NHLT init cleanup.Signed-off-by: Takashi Iwai List of files: /linux/drivers/gpu/trace/Makefile

41d91ec3de8a90167159275bde7ed65768723556 - Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into asoc-5.7

Wed, 22 Apr 2020 09:51:44 +0200

Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into asoc-5.7ASoC: tegra: Fixes for v5.7-rc3This contains a couple of fixes that are needed to properly reconfigurethe audio clocks on older Tegra devices. List of files: /linux/drivers/gpu/trace/Makefile

175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3 - Merge branch 'fixes-v5.7' into fixes

Tue, 21 Apr 2020 18:36:03 +0200

Merge branch 'fixes-v5.7' into fixes List of files: /linux/drivers/gpu/trace/Makefile

3bda03865fcaf5e30248bf4b7b37a81f6966caf9 - Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

Tue, 21 Apr 2020 15:37:13 +0200

Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-masterKVM: s390: Fix for 5.7 and maintainer update- Silence false positive lockdep warning- add Claudio as reviewer List of files: /linux/drivers/gpu/trace/Makefile

08d99b2c23dfa84ca5b5e5c194062a0550888b71 - Merge drm/drm-next into drm-misc-next

Fri, 17 Apr 2020 08:12:22 +0200

Merge drm/drm-next into drm-misc-nextBackmerging required to pull topic/phy-compliance.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/gpu/trace/Makefile

2b703bbda2713fd2a7d98029ea6c44f9c3159f34 - Merge drm/drm-next into drm-intel-next-queued

Thu, 16 Apr 2020 13:35:16 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging in order to pull "topic/phy-compliance".Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/gpu/trace/Makefile

a4721ced760684d1776bf31f7925aa41bb3f4846 - Merge v5.7-rc1 into drm-misc-fixes

Tue, 14 Apr 2020 09:19:50 +0200

Merge v5.7-rc1 into drm-misc-fixesStart the new drm-misc-fixes cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/gpu/trace/Makefile

3b02a051d25d9600e9d403ad3043aed7de00160e - Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

Mon, 13 Apr 2020 09:44:39 +0200

Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refreshResolve these conflicts: arch/x86/Kconfig arch/x86/kernel/MakefileDo a minor "evil merge" to move the KCSAN entry up a bit by a few linesin the Kconfig to reduce the probability of future conflicts.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/trace/Makefile

aa1a8ce533324d12696a9f4b71dbc5eb561a2e04 - Merge tag 'trace-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Sun, 05 Apr 2020 19:36:18 +0200

Merge tag 'trace-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-tracePull tracing updates from Steven Rostedt: "New tracing features: - The ring buffer is no longer disabled when reading the trace file. The trace_pipe file was made to be used for live tracing and reading as it acted like the normal producer/consumer. As the trace file would not consume the data, the easy way of handling it was to just disable writes to the ring buffer. This came to a surprise to the BPF folks who complained about lost events due to reading. This is no longer an issue. If someone wants to keep the old disabling there's a new option "pause-on-trace" that can be set. - New set_ftrace_notrace_pid file. PIDs in this file will not be traced by the function tracer. Similar to set_ftrace_pid, which makes the function tracer only trace those tasks with PIDs in the file, the set_ftrace_notrace_pid does the reverse. - New set_event_notrace_pid file. PIDs in this file will cause events not to be traced if triggered by a task with a matching PID. Similar to the set_event_pid file but will not be traced. Note, sched_waking and sched_switch events may still be traced if one of the tasks referenced by those events contains a PID that is allowed to be traced. Tracing related features: - New bootconfig option, that is attached to the initrd file. If bootconfig is on the command line, then the initrd file is searched looking for a bootconfig appended at the end. - New GPU tracepoint infrastructure to help the gfx drivers to get off debugfs (acked by Greg Kroah-Hartman) And other minor updates and fixes"* tag 'trace-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (27 commits) tracing: Do not allocate buffer in trace_find_next_entry() in atomic tracing: Add documentation on set_ftrace_notrace_pid and set_event_notrace_pid selftests/ftrace: Add test to test new set_event_notrace_pid file selftests/ftrace: Add test to test new set_ftrace_notrace_pid file tracing: Create set_event_notrace_pid to not trace tasks ftrace: Create set_ftrace_notrace_pid to not trace tasks ftrace: Make function trace pid filtering a bit more exact ftrace/kprobe: Show the maxactive number on kprobe_events tracing: Have the document reflect that the trace file keeps tracing enabled ring-buffer/tracing: Have iterator acknowledge dropped events tracing: Do not disable tracing when reading the trace file ring-buffer: Do not disable recording when there is an iterator ring-buffer: Make resize disable per cpu buffer instead of total buffer ring-buffer: Optimize rb_iter_head_event() ring-buffer: Do not die if rb_iter_peek() fails more than thrice ring-buffer: Have rb_iter_head_event() handle concurrent writer ring-buffer: Add page_stamp to iterator for synchronization ring-buffer: Rename ring_buffer_read() to read_buffer_iter_advance() ring-buffer: Have ring_buffer_empty() not depend on tracing stopped tracing: Save off entry when peeking at next entry ... List of files: /linux/drivers/gpu/trace/Makefile

bbd9d05618a6d608c72640b1d3d651a75913456a - gpu/trace: add a gpu total memory usage tracepoint

Tue, 03 Mar 2020 00:50:44 +0100

gpu/trace: add a gpu total memory usage tracepointThis change adds the below gpu memory tracepoint:gpu_mem/gpu_mem_total: track global or proc gpu memory total usagesPer process tracking of total gpu memory usage in the gem layer is notappropriate and hard to implement with trivial overhead. So for the gfxdevice driver layer to track total gpu memory usage both globally andper process in an easy and uniform way is to integrate the tracepoint inthis patch to the underlying varied implementations of gpu memorytracking system from vendors.Putting this tracepoint in the common trace events can not only helpwean the gfx drivers off of debugfs but also greatly help the downstreamAndroid gpu vendors because debugfs is to be deprecated in the upcomingAndroid release. Then the gpu memory tracking of both Android kernel andthe upstream linux kernel can stay closely, which can benefit the wholekernel eco-system in the long term.Link: http://lkml.kernel.org/r/20200302235044.59163-1-zzyiwei@google.comAcked-by: Greg Kroah-Hartman Signed-off-by: Yiwei Zhang Signed-off-by: Steven Rostedt (VMware) List of files: /linux/drivers/gpu/trace/Makefile