Commit 302cc446 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR (net-6.13-rc2).

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents da4fa00a 896d8946

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ series 


# ctags files

tags

!tags/

TAGS



# cscope files

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

+64 −0
Original line number Diff line number Diff line
@@ -342,6 +342,70 @@ Description: Specific uncompressed frame descriptors 
					   support

		=========================  =====================================



What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased

Date:           Sept 2024

KernelVersion:  5.15

Description:    Framebased format descriptors



What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name

Date:           Sept 2024

KernelVersion:  5.15

Description:    Specific framebased format descriptors



                ==================      =======================================

                bFormatIndex            unique id for this format descriptor;

                                        only defined after parent header is

                                        linked into the streaming class;

                                        read-only

                bmaControls             this format's data for bmaControls in

                                        the streaming header

                bmInterlaceFlags        specifies interlace information,

                                        read-only

                bAspectRatioY           the X dimension of the picture aspect

                                        ratio, read-only

                bAspectRatioX           the Y dimension of the picture aspect

                                        ratio, read-only

                bDefaultFrameIndex      optimum frame index for this stream

                bBitsPerPixel           number of bits per pixel used to

                                        specify color in the decoded video

                                        frame

                guidFormat              globally unique id used to identify

                                        stream-encoding format

                ==================      =======================================



What:           /config/usb-gadget/gadget/functions/uvc.name/streaming/framebased/name/name

Date:           Sept 2024

KernelVersion:  5.15

Description:    Specific framebased frame descriptors



                =========================  =====================================

                bFrameIndex                unique id for this framedescriptor;

                                           only defined after parent format is

                                           linked into the streaming header;

                                           read-only

                dwFrameInterval            indicates how frame interval can be

                                           programmed; a number of values

                                           separated by newline can be specified

                dwDefaultFrameInterval     the frame interval the device would

                                           like to use as default

                dwBytesPerLine             Specifies the number of bytes per line

                                           of video for packed fixed frame size

                                           formats, allowing the receiver to

                                           perform stride alignment of the video.

                                           If the bVariableSize value (above) is

                                           TRUE (1), or if the format does not

                                           permit such alignment, this value shall

                                           be set to zero (0).

                dwMaxBitRate               the maximum bit rate at the shortest

                                           frame interval in bps

                dwMinBitRate               the minimum bit rate at the longest

                                           frame interval in bps

                wHeight                    height of decoded bitmap frame in px

                wWidth                     width of decoded bitmam frame in px

                bmCapabilities             still image support, fixed frame-rate

                                           support

                =========================  =====================================



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header

Date:		Dec 2014

KernelVersion:	4.0

Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu

+8 −7
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Description: Read-only. Attribute group to describe the magic bits 
                Each attribute under this group defines a bit range of the

                perf_event_attr.config. Supported attribute are listed

                below::



                  event = "config:0-31" - event ID



                For example::

Documentation/ABI/testing/sysfs-bus-iio

+32 −0
Original line number Diff line number Diff line
@@ -2268,6 +2268,30 @@ Description: 
		An example format is 16-bytes, 2-digits-per-byte, HEX-string

		representing the sensor unique ID number.



What:		/sys/bus/iio/devices/iio:deviceX/filter_type_available

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_mode_available

KernelVersion:	6.1

Contact:	linux-iio@vger.kernel.org

Description:

		Reading returns a list with the possible filter modes. Options

		for the attribute:



		* "sinc3" - The digital sinc3 filter. Moderate 1st

		  conversion time. Good noise performance.

		* "sinc4" - Sinc 4. Excellent noise performance. Long

		  1st conversion time.

		* "sinc5" - The digital sinc5 filter. Excellent noise

		  performance

		* "sinc4+sinc1" - Sinc4 + averaging by 8. Low 1st conversion

		  time.

		* "sinc3+rej60" - Sinc3 + 60Hz rejection.

		* "sinc3+sinc1" - Sinc3 + averaging by 8. Low 1st conversion

		  time.

		* "sinc3+pf1" - Sinc3 + device specific Post Filter 1.

		* "sinc3+pf2" - Sinc3 + device specific Post Filter 2.

		* "sinc3+pf3" - Sinc3 + device specific Post Filter 3.

		* "sinc3+pf4" - Sinc3 + device specific Post Filter 4.



What:		/sys/.../events/in_proximity_thresh_either_runningperiod

KernelVersion:	6.6

Contact:	linux-iio@vger.kernel.org
@@ -2339,3 +2363,11 @@ KernelVersion: 6.10 
Contact:	linux-iio@vger.kernel.org

Description:

		The value of current sense resistor in Ohms.



What:		/sys/.../iio:deviceX/in_attention_input

KernelVersion:	6.13

Contact:	linux-iio@vger.kernel.org

Description:

		Value representing the user's attention to the system expressed

		in units as percentage. This usually means if the user is

		looking at the screen or not.

Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_mode_available

KernelVersion:  6.2

Contact:	linux-iio@vger.kernel.org

Description:

		Reading returns a list with the possible filter modes.



		  * "sinc4"       - Sinc 4. Excellent noise performance. Long

                    1st conversion time. No natural 50/60Hz rejection.



		  * "sinc4+sinc1" - Sinc4 + averaging by 8. Low 1st conversion

		    time.



		  * "sinc3"	      - Sinc3. Moderate 1st conversion time.

		    Good noise performance.



		  * "sinc3+rej60" - Sinc3 + 60Hz rejection. At a sampling

		    frequency of 50Hz, achieves simultaneous 50Hz and 60Hz

		    rejection.



		  * "sinc3+sinc1" - Sinc3 + averaging by 8. Low 1st conversion

		    time. Best used with a sampling frequency of at least

		    216.19Hz.



		  * "sinc3+pf1"   - Sinc3 + Post Filter 1. 53dB rejection @

		    50Hz, 58dB rejection @ 60Hz.



		  * "sinc3+pf2"   - Sinc3 + Post Filter 2. 70dB rejection @

		    50Hz, 70dB rejection @ 60Hz.



		  * "sinc3+pf3"   - Sinc3 + Post Filter 3. 99dB rejection @

		    50Hz, 103dB rejection @ 60Hz.



		  * "sinc3+pf4"   - Sinc3 + Post Filter 4. 103dB rejection @

		    50Hz, 109dB rejection @ 60Hz.



What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_filter_mode

KernelVersion:  6.2

Contact:	linux-iio@vger.kernel.org

Description:

		Set the filter mode of the differential channel. When the filter

		mode changes, the in_voltageY-voltageZ_sampling_frequency and

		in_voltageY-voltageZ_sampling_frequency_available attributes

		might also change to accommodate the new filter mode.

		If the current sampling frequency is out of range for the new

		filter mode, the sampling frequency will be changed to the

		closest valid one.