Skip to content

Commit 266f6b4

Browse files
committed
Merge tag 'v5.4.75' into linux-5.4-at91
This is the 5.4.75 stable release
2 parents ffcd863 + 6e97ed6 commit 266f6b4

236 files changed

Lines changed: 2912 additions & 1212 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5462,6 +5462,14 @@
54625462
as generic guest with no PV drivers. Currently support
54635463
XEN HVM, KVM, HYPER_V and VMWARE guest.
54645464

5465+
xen.event_eoi_delay= [XEN]
5466+
How long to delay EOI handling in case of event
5467+
storms (jiffies). Default is 10.
5468+
5469+
xen.event_loop_timeout= [XEN]
5470+
After which time (jiffies) the event handling loop
5471+
should start to delay EOI handling. Default is 2.
5472+
54655473
xirc2ps_cs= [NET,PCMCIA]
54665474
Format:
54675475
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ whole range, 0-255, dividing the angular value by 1.41. The enum
3636
:c:type:`v4l2_hsv_encoding` specifies which encoding is used.
3737

3838
.. note:: The default R'G'B' quantization is full range for all
39-
colorspaces except for BT.2020 which uses limited range R'G'B'
40-
quantization.
39+
colorspaces. HSV formats are always full range.
4140

4241
.. tabularcolumns:: |p{6.7cm}|p{10.8cm}|
4342

@@ -169,8 +168,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum
169168
- Details
170169
* - ``V4L2_QUANTIZATION_DEFAULT``
171170
- Use the default quantization encoding as defined by the
172-
colorspace. This is always full range for R'G'B' (except for the
173-
BT.2020 colorspace) and HSV. It is usually limited range for Y'CbCr.
171+
colorspace. This is always full range for R'G'B' and HSV.
172+
It is usually limited range for Y'CbCr.
174173
* - ``V4L2_QUANTIZATION_FULL_RANGE``
175174
- Use the full range quantization encoding. I.e. the range [0…1] is
176175
mapped to [0…255] (with possible clipping to [1…254] to avoid the
@@ -180,4 +179,4 @@ whole range, 0-255, dividing the angular value by 1.41. The enum
180179
* - ``V4L2_QUANTIZATION_LIM_RANGE``
181180
- Use the limited range quantization encoding. I.e. the range [0…1]
182181
is mapped to [16…235]. Cb and Cr are mapped from [-0.5…0.5] to
183-
[16…240].
182+
[16…240]. Limited Range cannot be used with HSV.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,8 @@ Colorspace BT.2020 (V4L2_COLORSPACE_BT2020)
377377
The :ref:`itu2020` standard defines the colorspace used by Ultra-high
378378
definition television (UHDTV). The default transfer function is
379379
``V4L2_XFER_FUNC_709``. The default Y'CbCr encoding is
380-
``V4L2_YCBCR_ENC_BT2020``. The default R'G'B' quantization is limited
381-
range (!), and so is the default Y'CbCr quantization. The chromaticities
382-
of the primary colors and the white reference are:
380+
``V4L2_YCBCR_ENC_BT2020``. The default Y'CbCr quantization is limited range.
381+
The chromaticities of the primary colors and the white reference are:
383382

384383

385384

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 4
4-
SUBLEVEL = 74
4+
SUBLEVEL = 75
55
EXTRAVERSION = -linux4sam-2020.10-rc2
66
NAME = Kleptomaniac Octopus
77

arch/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,13 @@ config MMU_GATHER_NO_RANGE
405405
config HAVE_MMU_GATHER_NO_GATHER
406406
bool
407407

408+
config ARCH_WANT_IRQS_OFF_ACTIVATE_MM
409+
bool
410+
help
411+
Temporary select until all architectures can be converted to have
412+
irqs disabled over activate_mm. Architectures that do IPI based TLB
413+
shootdowns should enable this.
414+
408415
config ARCH_HAVE_NMI_SAFE_CMPXCHG
409416
bool
410417

arch/arc/boot/dts/axc001.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
* avoid duplicating the MB dtsi file given that IRQ from
8686
* this intc to cpu intc are different for axs101 and axs103
8787
*/
88-
mb_intc: dw-apb-ictl@e0012000 {
88+
mb_intc: interrupt-controller@e0012000 {
8989
#interrupt-cells = <1>;
9090
compatible = "snps,dw-apb-ictl";
9191
reg = < 0x0 0xe0012000 0x0 0x200 >;

arch/arc/boot/dts/axc003.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
* avoid duplicating the MB dtsi file given that IRQ from
130130
* this intc to cpu intc are different for axs101 and axs103
131131
*/
132-
mb_intc: dw-apb-ictl@e0012000 {
132+
mb_intc: interrupt-controller@e0012000 {
133133
#interrupt-cells = <1>;
134134
compatible = "snps,dw-apb-ictl";
135135
reg = < 0x0 0xe0012000 0x0 0x200 >;

arch/arc/boot/dts/axc003_idu.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
* avoid duplicating the MB dtsi file given that IRQ from
136136
* this intc to cpu intc are different for axs101 and axs103
137137
*/
138-
mb_intc: dw-apb-ictl@e0012000 {
138+
mb_intc: interrupt-controller@e0012000 {
139139
#interrupt-cells = <1>;
140140
compatible = "snps,dw-apb-ictl";
141141
reg = < 0x0 0xe0012000 0x0 0x200 >;

arch/arc/boot/dts/vdk_axc003.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
};
4848

49-
mb_intc: dw-apb-ictl@e0012000 {
49+
mb_intc: interrupt-controller@e0012000 {
5050
#interrupt-cells = <1>;
5151
compatible = "snps,dw-apb-ictl";
5252
reg = < 0xe0012000 0x200 >;

arch/arc/boot/dts/vdk_axc003_idu.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
};
5656

57-
mb_intc: dw-apb-ictl@e0012000 {
57+
mb_intc: interrupt-controller@e0012000 {
5858
#interrupt-cells = <1>;
5959
compatible = "snps,dw-apb-ictl";
6060
reg = < 0xe0012000 0x200 >;

0 commit comments

Comments
 (0)