Merge remote-tracking branch 'torvalds/master' into perf-tools-next (173b0b5b) · Commits · git / linux-net

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@
		*.xz
		*.zst
		Module.symvers
		dtbs-list
		modules.order

		#

.mailmap

+14 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ Adam Oldham <oldhamca@gmail.com>
		Adam Radford <aradford@gmail.com>
		Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
		Adrian Bunk <bunk@stusta.de>
		Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
		Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
		Alan Cox <alan@lxorguk.ukuu.org.uk>
		Alan Cox <root@hraefn.swansea.linux.org.uk>
		@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
		Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
		Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
		Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
		Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
		Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
		Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
		Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
		@@ -110,6 +112,7 @@ Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>
		Brian Avery <b.avery@hp.com>
		Brian King <brking@us.ibm.com>
		Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
		Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>
		Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
		Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
		Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
		@@ -340,7 +343,8 @@ Lee Jones <lee@kernel.org> <joneslee@google.com>
		Lee Jones <lee@kernel.org> <lee.jones@canonical.com>
		Lee Jones <lee@kernel.org> <lee.jones@linaro.org>
		Lee Jones <lee@kernel.org> <lee@ubuntu.com>
		Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
		Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@nxp.com>
		Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@intel.com>
		Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
		Leonard Göhrs <l.goehrs@pengutronix.de>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		@@ -439,8 +443,11 @@ Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org>
		Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
		Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>
		Mythri P K <mythripk@ti.com>
		Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>
		Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
		Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
		Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
		Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
		Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
		Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
		Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
		Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
		@@ -495,7 +502,8 @@ Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>
		Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
		Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
		Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
		Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
		Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
		Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
		Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
		Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
		Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
		@@ -517,6 +525,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
		Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
		Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com>
		Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
		Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
		Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
		@@ -525,6 +534,7 @@ Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
		Ronak Doshi <ronak.doshi@broadcom.com> <doshir@vmware.com>
		Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
		Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
		Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
		@@ -647,6 +657,7 @@ Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
		Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>
		Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>
		Vishnu Dasa <vishnu.dasa@broadcom.com> <vdasa@vmware.com>
		Vivek Aknurwar <quic_viveka@quicinc.com> <viveka@codeaurora.org>
		Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
		Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -3146,6 +3146,10 @@ S: Triftstra=DFe 55
		S: 13353 Berlin
		S: Germany

		N: Gustavo Pimental
		E: gustavo.pimentel@synopsys.com
		D: PCI driver for Synopsys DesignWare

		N: Emanuel Pirker
		E: epirker@edu.uni-klu.ac.at
		D: AIC5800 IEEE 1394, RAW I/O on 1394

Documentation/ABI/testing/configfs-usb-gadget-ffs

+10 −2

Original line number	Diff line number	Diff line
		@@ -4,6 +4,14 @@ KernelVersion: 3.13
		Description: The purpose of this directory is to create and remove it.

		A corresponding USB function instance is created/removed.
		There are no attributes here.

		All parameters are set through FunctionFS.
		All attributes are read only:

		============= ============================================
		ready 1 if the function is ready to be used, E.G.
		if userspace has written descriptors and
		strings to ep0, so the gadget can be
		enabled - 0 otherwise.
		============= ============================================

		All other parameters are set through FunctionFS.

Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

+87 −0

Original line number	Diff line number	Diff line
		@@ -170,3 +170,90 @@ Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_t
		Description:
		(RW) Set/Get the MSR(mux select register) for the DSB subunit
		TPDM.

		What: /sys/bus/coresight/devices/<tpdm-name>/cmb_mode
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description: (Write) Set the data collection mode of CMB tpdm. Continuous
		change creates CMB data set elements on every CMBCLK edge.
		Trace-on-change creates CMB data set elements only when a new
		data set element differs in value from the previous element
		in a CMB data set.

		Accepts only one of the 2 values - 0 or 1.
		0 : Continuous CMB collection mode.
		1 : Trace-on-change CMB collection mode.

		What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpr[0:1]
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(RW) Set/Get the value of the trigger pattern for the CMB
		subunit TPDM.

		What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpmr[0:1]
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(RW) Set/Get the mask of the trigger pattern for the CMB
		subunit TPDM.

		What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpr[0:1]
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(RW) Set/Get the value of the pattern for the CMB subunit TPDM.

		What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpmr[0:1]
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(RW) Set/Get the mask of the pattern for the CMB subunit TPDM.

		What: /sys/bus/coresight/devices/<tpdm-name>/cmb_patt/enable_ts
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(Write) Set the pattern timestamp of CMB tpdm. Read
		the pattern timestamp of CMB tpdm.

		Accepts only one of the 2 values - 0 or 1.
		0 : Disable CMB pattern timestamp.
		1 : Enable CMB pattern timestamp.

		What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_ts
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(RW) Set/Get the trigger timestamp of the CMB for tpdm.

		Accepts only one of the 2 values - 0 or 1.
		0 : Set the CMB trigger type to false
		1 : Set the CMB trigger type to true

		What: /sys/bus/coresight/devices/<tpdm-name>/cmb_ts_all
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(RW) Read or write the status of timestamp upon all interface.
		Only value 0 and 1 can be written to this node. Set this node to 1 to requeset
		timestamp to all trace packet.
		Accepts only one of the 2 values - 0 or 1.
		0 : Disable the timestamp of all trace packets.
		1 : Enable the timestamp of all trace packets.

		What: /sys/bus/coresight/devices/<tpdm-name>/cmb_msr/msr[0:31]
		Date: January 2024
		KernelVersion 6.9
		Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
		Description:
		(RW) Set/Get the MSR(mux select register) for the CMB subunit
		TPDM.