Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58fada0d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19-stable.157 (8ee67bc8) into msm-4.19"

parents 7dff37c6 20912a8a

Documentation/admin-guide/kernel-parameters.txt

+9 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ 
			loops can be debugged more effectively on production

			systems.



	clearcpuid=BITNUM [X86]

	clearcpuid=BITNUM[,BITNUM...] [X86]

			Disable CPUID feature X for the kernel. See

			arch/x86/include/asm/cpufeatures.h for the valid bit

			numbers. Note the Linux specific bits are not necessarily
@@ -5302,6 +5302,14 @@ 
			with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.

			Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.



	xen.event_eoi_delay=	[XEN]

			How long to delay EOI handling in case of event

			storms (jiffies). Default is 10.



	xen.event_loop_timeout=	[XEN]

			After which time (jiffies) the event handling loop

			should start to delay EOI handling. Default is 2.



	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

Documentation/core-api/timekeeping.rst

+7 −3
Original line number Diff line number Diff line
@@ -99,16 +99,20 @@ Coarse and fast_ns access 


Some additional variants exist for more specialized cases:



.. c:function:: ktime_t ktime_get_coarse_boottime( void )

.. c:function:: ktime_t ktime_get_coarse( void )

		ktime_t ktime_get_coarse_boottime( void )

		ktime_t ktime_get_coarse_real( void )

		ktime_t ktime_get_coarse_clocktai( void )

		ktime_t ktime_get_coarse_raw( void )



.. c:function:: u64 ktime_get_coarse_ns( void )

		u64 ktime_get_coarse_boottime_ns( void )

		u64 ktime_get_coarse_real_ns( void )

		u64 ktime_get_coarse_clocktai_ns( void )



.. c:function:: void ktime_get_coarse_ts64( struct timespec64 * )

		void ktime_get_coarse_boottime_ts64( struct timespec64 * )

		void ktime_get_coarse_real_ts64( struct timespec64 * )

		void ktime_get_coarse_clocktai_ts64( struct timespec64 * )

		void ktime_get_coarse_raw_ts64( struct timespec64 * )



	These are quicker than the non-coarse versions, but less accurate,

	corresponding to CLOCK_MONONOTNIC_COARSE and CLOCK_REALTIME_COARSE

Documentation/media/uapi/v4l/colorspaces-defs.rst

+4 −5
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ whole range, 0-255, dividing the angular value by 1.41. The enum 
:c:type:`v4l2_hsv_encoding` specifies which encoding is used.



.. note:: The default R'G'B' quantization is full range for all

   colorspaces except for BT.2020 which uses limited range R'G'B'

   quantization.

   colorspaces. HSV formats are always full range.



.. tabularcolumns:: |p{6.0cm}|p{11.5cm}|
@@ -162,8 +161,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum 
      - Details

    * - ``V4L2_QUANTIZATION_DEFAULT``

      - Use the default quantization encoding as defined by the

	colorspace. This is always full range for R'G'B' (except for the

	BT.2020 colorspace) and HSV. It is usually limited range for Y'CbCr.

	colorspace. This is always full range for R'G'B' and HSV.

	It is usually limited range for Y'CbCr.

    * - ``V4L2_QUANTIZATION_FULL_RANGE``

      - Use the full range quantization encoding. I.e. the range [0…1] is

	mapped to [0…255] (with possible clipping to [1…254] to avoid the
@@ -173,4 +172,4 @@ whole range, 0-255, dividing the angular value by 1.41. The enum 
    * - ``V4L2_QUANTIZATION_LIM_RANGE``

      - Use the limited range quantization encoding. I.e. the range [0…1]

	is mapped to [16…235]. Cb and Cr are mapped from [-0.5…0.5] to

	[16…240].
 
	[16…240]. Limited Range cannot be used with HSV.

Documentation/media/uapi/v4l/colorspaces-details.rst

+2 −3
Original line number Diff line number Diff line
@@ -370,9 +370,8 @@ Colorspace BT.2020 (V4L2_COLORSPACE_BT2020) 
The :ref:`itu2020` standard defines the colorspace used by Ultra-high

definition television (UHDTV). The default transfer function is

``V4L2_XFER_FUNC_709``. The default Y'CbCr encoding is

``V4L2_YCBCR_ENC_BT2020``. The default R'G'B' quantization is limited

range (!), and so is the default Y'CbCr quantization. The chromaticities

of the primary colors and the white reference are:

``V4L2_YCBCR_ENC_BT2020``. The default Y'CbCr quantization is limited range.

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

Documentation/networking/ip-sysctl.txt

+3 −1
Original line number Diff line number Diff line
@@ -949,12 +949,14 @@ icmp_ratelimit - INTEGER 
icmp_msgs_per_sec - INTEGER

	Limit maximal number of ICMP packets sent per second from this host.

	Only messages whose type matches icmp_ratemask (see below) are

	controlled by this limit.

	controlled by this limit. For security reasons, the precise count

	of messages per second is randomized.

	Default: 1000



icmp_msgs_burst - INTEGER

	icmp_msgs_per_sec controls number of ICMP packets sent per second,

	while icmp_msgs_burst controls the burst size of these packets.

	For security reasons, the precise burst size is randomized.

	Default: 50



icmp_ratemask - INTEGER