Changes in brcms_trace_brcmsmac_msg.h

c771600c6af14749609b49565ffb4cac2959710d - Merge drm/drm-next into drm-intel-gt-next

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

36ec807b627b4c0a0a382f0ae48eac7187d14b2b - Merge branch 'next' into for-linus

Fri, 20 Sep 2024 10:24:24 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.12 merge window. List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

3daee2e4b3568f0ed88b0598df96547fcf21cb9b - Merge tag 'v6.10' into next

Tue, 16 Jul 2024 00:50:05 +0200

Merge tag 'v6.10' into nextSync up with mainline to bring in device_for_each_child_node_scoped()and other newer APIs. List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

afeea2758b4f1210361ce2a91d8fa3e7df606ad2 - Merge drm-misc-next-2024-07-04 into drm-misc-next-fixes

Thu, 04 Jul 2024 15:19:33 +0200

Merge drm-misc-next-2024-07-04 into drm-misc-next-fixesLet's start the drm-misc-next-fixes cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

d754ed2821fd9675d203cb73c4afcd593e28b7d0 - Merge drm/drm-next into drm-intel-next

Wed, 19 Jun 2024 10:38:31 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.10-rc3.Signed-off-by: Jani Nikula List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

89aa02edaa30e4327ebc8fca9b80795bbfd4ce9b - Merge drm/drm-next into drm-xe-next

Wed, 12 Jun 2024 17:31:42 +0200

Merge drm/drm-next into drm-xe-nextNeeded to get tracing cleanup and add mmio tracing series.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

92815da4576a495cb6362cdfb132152fccc2222d - Merge remote-tracking branch 'drm-misc/drm-misc-next' into HEAD

Wed, 12 Jun 2024 15:51:59 +0200

Merge remote-tracking branch 'drm-misc/drm-misc-next' into HEADMerge drm-misc-next tree into the msm-next tree in order to be able touse HDMI connector framework for the MSM HDMI driver. List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

375c4d1583948cf2439833e4a85d5a0aee853895 - Merge drm/drm-next into drm-misc-next

Mon, 27 May 2024 11:08:31 +0200

Merge drm/drm-next into drm-misc-nextLet's start the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

3c69140734a27f8b145f12fa0ae80c1fe36a02ca - Merge branch 'for-6.11/trivial' into for-linus

Tue, 16 Jul 2024 12:19:28 +0200

Merge branch 'for-6.11/trivial' into for-linusCouple of trivial fixes:- extra semicolon (Chen Ni)- typo (Thorsten Blum) List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99 - Merge branch 'tip/x86/cpu'

Thu, 04 Jul 2024 16:00:24 +0200

Merge branch 'tip/x86/cpu'The Lunarlake patches rely on the new VFM stuff.Signed-off-by: Peter Zijlstra List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

594ce0b8a998aa4d05827cd7c0d0dcec9a1e3ae2 - Merge topic branches 'clkdev' and 'fixes' into for-linus

Mon, 10 Jun 2024 13:03:21 +0200

Merge topic branches 'clkdev' and 'fixes' into for-linus List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

f73a058be5d70dd81a43f16b2bbff4b1576a7af8 - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Tue, 28 May 2024 22:21:34 +0200

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesv6.10-rc1 is released, forward from v6.9Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

d6a326d694e77fd1d90ae40ad3c73a6af0eb1b8d - Merge tag 'trace-assign-str-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Thu, 23 May 2024 21:28:01 +0200

Merge tag 'trace-assign-str-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-tracePull tracing cleanup from Steven Rostedt: "Remove second argument of __assign_str() The __assign_str() macro logic of the TRACE_EVENT() macro was optimized so that it no longer needs the second argument. The __assign_str() is always matched with __string() field that takes a field name and the source for that field: __string(field, source) The TRACE_EVENT() macro logic will save off the source value and then use that value to copy into the ring buffer via the __assign_str(). Before commit c1fa617caeb0 ("tracing: Rework __assign_str() and __string() to not duplicate getting the string"), the __assign_str() needed the second argument which would perform the same logic as the __string() source parameter did. Not only would this add overhead, but it was error prone as if the __assign_str() source produced something different, it may not have allocated enough for the string in the ring buffer (as the __string() source was used to determine how much to allocate) Now that the __assign_str() just uses the same string that was used in __string() it no longer needs the source parameter. It can now be removed"* tag 'trace-assign-str-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing/treewide: Remove second parameter of __assign_str() List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

2c92ca849fcc6ee7d0c358e9959abc9f58661aea - tracing/treewide: Remove second parameter of __assign_str()

Thu, 16 May 2024 19:34:54 +0200

tracing/treewide: Remove second parameter of __assign_str()With the rework of how the __string() handles dynamic strings where itsaves off the source string in field in the helper structure[1], theassignment of that value to the trace event field is stored in the helpervalue and does not need to be passed in again.This means that with: __string(field, mystring)Which use to be assigned with __assign_str(field, mystring), no longerneeds the second parameter and it is unused. With this, __assign_str()will now only get a single parameter.There's over 700 users of __assign_str() and because coccinelle does nothandle the TRACE_EVENT() macro I ended up using the following sed script: git grep -l __assign_str | while read a ; do sed -e 's/$__assign_str([^,]*[^ ,]$ *,[^;]*/\1)/' $a > /tmp/test-file; mv /tmp/test-file $a; doneI then searched for __assign_str() that did not end with ';' as thosewere multi line assignments that the sed script above would fail to catch.Note, the same updates will need to be done for: __assign_str_len() __assign_rel_str() __assign_rel_str_len()I tested this with both an allmodconfig and an allyesconfig (build only for both).[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.homeCc: Masami Hiramatsu Cc: Mathieu Desnoyers Cc: Linus Torvalds Cc: Julia Lawall Signed-off-by: Steven Rostedt (Google) Acked-by: Jani Nikula Acked-by: Christian König for the amdgpu parts.Acked-by: Thomas Hellström #forAcked-by: Rafael J. Wysocki # for thermalAcked-by: Takashi Iwai Acked-by: Darrick J. Wong # xfsTested-by: Guenter Roeck List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

cdd5b5a9761fd66d17586e4f4ba6588c70e640ea - Merge branch 'next' into for-linus

Tue, 07 Nov 2023 00:42:08 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.7 merge window. List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

34069d12e239ae8f36dd96c378e4622fb1c42a76 - Merge tag 'v6.5' into next

Tue, 05 Sep 2023 23:08:14 +0200

Merge tag 'v6.5' into nextSync up with mainline to bring in updates to the shared infrastructure. List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

2612e3bbc0386368a850140a6c9b990cd496a5ec - Merge drm/drm-next into drm-intel-next

Mon, 07 Aug 2023 23:14:42 +0200

Merge drm/drm-next into drm-intel-nextCatching-up with drm-next and drm-intel-gt-next.It will unblock a code refactor around the platformdefinitions (names vs acronyms).Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

9f771739a04919226081a107167596de75108fbb - Merge drm/drm-next into drm-intel-gt-next

Mon, 07 Aug 2023 12:29:40 +0200

Merge drm/drm-next into drm-intel-gt-nextNeed to pull in b3e4aae612ec ("drm/i915/hdcp: Modify hdcp_gsc_message msg sending mechanism") asa dependency for https://patchwork.freedesktop.org/series/121735/Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

61b7369483efb5e0a9f3b48e75fac00d46d661e0 - Merge drm/drm-next into drm-misc-next

Mon, 24 Jul 2023 15:44:47 +0200

Merge drm/drm-next into drm-misc-nextBackmerging to get v6.5-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h

0791faebfe750292a8a842b64795a390ca4a3b51 - ASoC: Merge v6.5-rc2

Mon, 17 Jul 2023 07:12:31 +0200

ASoC: Merge v6.5-rc2Get a similar baseline to my other branches, and fixes for people usingthe branch. List of files: /linux/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h