Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (3f64116a) · Commits · e / devices / android_kernel_oneplus_sm7250

CREDITS

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2478,12 +2478,11 @@ S: D-90453 Nuernberg
	S: Germany		S: Germany

	N: Arnaldo Carvalho de Melo		N: Arnaldo Carvalho de Melo
	E: acme@ghostprotocols.net		E: acme@kernel.org
	E: arnaldo.melo@gmail.com		E: arnaldo.melo@gmail.com
	E: acme@redhat.com		E: acme@redhat.com
	W: http://oops.ghostprotocols.net:81/blog/
	P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01		P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
	D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks		D: tools/, IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
	S: Brazil		S: Brazil

	N: Karsten Merker		N: Karsten Merker

Documentation/media/uapi/v4l/pixfmt-007.rst

+17 −6

Original line number	Original line	Diff line number	Diff line
	@@ -211,7 +211,13 @@ Colorspace sRGB (V4L2_COLORSPACE_SRGB)
	The :ref:`srgb` standard defines the colorspace used by most webcams		The :ref:`srgb` standard defines the colorspace used by most webcams
	and computer graphics. The default transfer function is		and computer graphics. The default transfer function is
	``V4L2_XFER_FUNC_SRGB``. The default Y'CbCr encoding is		``V4L2_XFER_FUNC_SRGB``. The default Y'CbCr encoding is
	``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full range.		``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited range.

			Note that the :ref:`sycc` standard specifies full range quantization,
			however all current capture hardware supported by the kernel convert
			R'G'B' to limited range Y'CbCr. So choosing full range as the default
			would break how applications interpret the quantization range.

	The chromaticities of the primary colors and the white reference are:		The chromaticities of the primary colors and the white reference are:


	@@ -276,7 +282,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding as defined by :ref:`sycc`:

	Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range		Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range
	[-0.5…0.5]. This transform is identical to one defined in SMPTE		[-0.5…0.5]. This transform is identical to one defined in SMPTE
	170M/BT.601. The Y'CbCr quantization is full range.		170M/BT.601. The Y'CbCr quantization is limited range.


	.. _col-adobergb:		.. _col-adobergb:
	@@ -288,10 +294,15 @@ The :ref:`adobergb` standard defines the colorspace used by computer
	graphics that use the AdobeRGB colorspace. This is also known as the		graphics that use the AdobeRGB colorspace. This is also known as the
	:ref:`oprgb` standard. The default transfer function is		:ref:`oprgb` standard. The default transfer function is
	``V4L2_XFER_FUNC_ADOBERGB``. The default Y'CbCr encoding is		``V4L2_XFER_FUNC_ADOBERGB``. The default Y'CbCr encoding is
	``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full		``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited
	range. The chromaticities of the primary colors and the white reference		range.
	are:
			Note that the :ref:`oprgb` standard specifies full range quantization,
			however all current capture hardware supported by the kernel convert
			R'G'B' to limited range Y'CbCr. So choosing full range as the default
			would break how applications interpret the quantization range.

			The chromaticities of the primary colors and the white reference are:


	.. tabularcolumns:: \|p{4.4cm}\|p{4.4cm}\|p{8.7cm}\|		.. tabularcolumns:: \|p{4.4cm}\|p{4.4cm}\|p{8.7cm}\|
	@@ -344,7 +355,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding:

	Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range		Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range
	[-0.5…0.5]. This transform is identical to one defined in SMPTE		[-0.5…0.5]. This transform is identical to one defined in SMPTE
	170M/BT.601. The Y'CbCr quantization is full range.		170M/BT.601. The Y'CbCr quantization is limited range.


	.. _col-bt2020:		.. _col-bt2020:

MAINTAINERS

+6 −9

Original line number	Original line	Diff line number	Diff line
	@@ -877,8 +877,8 @@ S: Odd fixes
	F: drivers/hwmon/applesmc.c		F: drivers/hwmon/applesmc.c

	APPLETALK NETWORK LAYER		APPLETALK NETWORK LAYER
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>		L: netdev@vger.kernel.org
	S: Maintained		S: Odd fixes
	F: drivers/net/appletalk/		F: drivers/net/appletalk/
	F: net/appletalk/		F: net/appletalk/

	@@ -6748,9 +6748,8 @@ S: Odd Fixes
	F: drivers/tty/ipwireless/		F: drivers/tty/ipwireless/

	IPX NETWORK LAYER		IPX NETWORK LAYER
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Maintained		S: Odd fixes
	F: include/net/ipx.h		F: include/net/ipx.h
	F: include/uapi/linux/ipx.h		F: include/uapi/linux/ipx.h
	F: net/ipx/		F: net/ipx/
	@@ -7522,8 +7521,8 @@ S: Maintained
	F: drivers/misc/lkdtm*		F: drivers/misc/lkdtm*

	LLC (802.2)		LLC (802.2)
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>		L: netdev@vger.kernel.org
	S: Maintained		S: Odd fixes
	F: include/linux/llc.h		F: include/linux/llc.h
	F: include/uapi/linux/llc.h		F: include/uapi/linux/llc.h
	F: include/net/llc*		F: include/net/llc*
	@@ -13416,10 +13415,8 @@ S: Maintained
	F: drivers/input/misc/wistron_btns.c		F: drivers/input/misc/wistron_btns.c

	WL3501 WIRELESS PCMCIA CARD DRIVER		WL3501 WIRELESS PCMCIA CARD DRIVER
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	W: http://oops.ghostprotocols.net:81/blog		S: Odd fixes
	S: Maintained
	F: drivers/net/wireless/wl3501*		F: drivers/net/wireless/wl3501*

	WOLFSON MICROELECTRONICS DRIVERS		WOLFSON MICROELECTRONICS DRIVERS

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 10		PATCHLEVEL = 10
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc7		EXTRAVERSION = -rc8
	NAME = Fearless Coyote		NAME = Fearless Coyote

	# DOCUMENTATION		# DOCUMENTATION

arch/x86/include/asm/processor.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,7 @@ struct cpuinfo_x86 {
	__u8 x86_phys_bits;		__u8 x86_phys_bits;
	/* CPUID returned core id bits: */		/* CPUID returned core id bits: */
	__u8 x86_coreid_bits;		__u8 x86_coreid_bits;
			__u8 cu_id;
	/* Max extended CPUID function supported: */		/* Max extended CPUID function supported: */
	__u32 extended_cpuid_level;		__u32 extended_cpuid_level;
	/* Maximum supported CPUID level, -1=no CPUID: */		/* Maximum supported CPUID level, -1=no CPUID: */