Skip to content

Commit d673efc

Browse files
Merge tag 'v6.12.43-rt12' into nilrt/master/6.12
v6.12.43-rt12 Signed-off-by: Erick Shepherd <erick.shepherd@ni.com>
2 parents 5ce16e1 + 627b83a commit d673efc

1,085 files changed

Lines changed: 10834 additions & 5439 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.

.clippy.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3+
msrv = "1.78.0"
4+
35
check-private-items = true
46

57
disallowed-macros = [

Documentation/filesystems/f2fs.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ usrjquota=<file> Appoint specified file and type during mount, so that quota
235235
grpjquota=<file> information can be properly updated during recovery flow,
236236
prjjquota=<file> <quota file>: must be in root directory;
237237
jqfmt=<quota type> <quota type>: [vfsold,vfsv0,vfsv1].
238-
offusrjquota Turn off user journalled quota.
239-
offgrpjquota Turn off group journalled quota.
240-
offprjjquota Turn off project journalled quota.
238+
usrjquota= Turn off user journalled quota.
239+
grpjquota= Turn off group journalled quota.
240+
prjjquota= Turn off project journalled quota.
241241
quota Enable plain user disk quota accounting.
242242
noquota Disable all plain disk quota option.
243243
alloc_mode=%s Adjust block allocation policy, which supports "reuse"

Documentation/filesystems/fscrypt.rst

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,8 @@ However, these ioctls have some limitations:
141141
CONFIG_PAGE_POISONING=y in your kernel config and add page_poison=1
142142
to your kernel command line. However, this has a performance cost.
143143

144-
- Secret keys might still exist in CPU registers, in crypto
145-
accelerator hardware (if used by the crypto API to implement any of
146-
the algorithms), or in other places not explicitly considered here.
144+
- Secret keys might still exist in CPU registers or in other places
145+
not explicitly considered here.
147146

148147
Limitations of v1 policies
149148
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -378,9 +377,12 @@ the work is done by XChaCha12, which is much faster than AES when AES
378377
acceleration is unavailable. For more information about Adiantum, see
379378
`the Adiantum paper <https://eprint.iacr.org/2018/720.pdf>`_.
380379

381-
The (AES-128-CBC-ESSIV, AES-128-CBC-CTS) pair exists only to support
382-
systems whose only form of AES acceleration is an off-CPU crypto
383-
accelerator such as CAAM or CESA that does not support XTS.
380+
The (AES-128-CBC-ESSIV, AES-128-CBC-CTS) pair was added to try to
381+
provide a more efficient option for systems that lack AES instructions
382+
in the CPU but do have a non-inline crypto engine such as CAAM or CESA
383+
that supports AES-CBC (and not AES-XTS). This is deprecated. It has
384+
been shown that just doing AES on the CPU is actually faster.
385+
Moreover, Adiantum is faster still and is recommended on such systems.
384386

385387
The remaining mode pairs are the "national pride ciphers":
386388

@@ -1289,22 +1291,13 @@ this by validating all top-level encryption policies prior to access.
12891291
Inline encryption support
12901292
=========================
12911293

1292-
By default, fscrypt uses the kernel crypto API for all cryptographic
1293-
operations (other than HKDF, which fscrypt partially implements
1294-
itself). The kernel crypto API supports hardware crypto accelerators,
1295-
but only ones that work in the traditional way where all inputs and
1296-
outputs (e.g. plaintexts and ciphertexts) are in memory. fscrypt can
1297-
take advantage of such hardware, but the traditional acceleration
1298-
model isn't particularly efficient and fscrypt hasn't been optimized
1299-
for it.
1300-
1301-
Instead, many newer systems (especially mobile SoCs) have *inline
1302-
encryption hardware* that can encrypt/decrypt data while it is on its
1303-
way to/from the storage device. Linux supports inline encryption
1304-
through a set of extensions to the block layer called *blk-crypto*.
1305-
blk-crypto allows filesystems to attach encryption contexts to bios
1306-
(I/O requests) to specify how the data will be encrypted or decrypted
1307-
in-line. For more information about blk-crypto, see
1294+
Many newer systems (especially mobile SoCs) have *inline encryption
1295+
hardware* that can encrypt/decrypt data while it is on its way to/from
1296+
the storage device. Linux supports inline encryption through a set of
1297+
extensions to the block layer called *blk-crypto*. blk-crypto allows
1298+
filesystems to attach encryption contexts to bios (I/O requests) to
1299+
specify how the data will be encrypted or decrypted in-line. For more
1300+
information about blk-crypto, see
13081301
:ref:`Documentation/block/inline-encryption.rst <inline_encryption>`.
13091302

13101303
On supported filesystems (currently ext4 and f2fs), fscrypt can use

Documentation/firmware-guide/acpi/i2c-muxes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Consider this topology::
1414
| | | 0x70 |--CH01--> i2c client B (0x50)
1515
+------+ +------+
1616

17-
which corresponds to the following ASL::
17+
which corresponds to the following ASL (in the scope of \_SB)::
1818

1919
Device (SMB1)
2020
{
@@ -24,7 +24,7 @@ which corresponds to the following ASL::
2424
Name (_HID, ...)
2525
Name (_CRS, ResourceTemplate () {
2626
I2cSerialBus (0x70, ControllerInitiated, I2C_SPEED,
27-
AddressingMode7Bit, "^SMB1", 0x00,
27+
AddressingMode7Bit, "\\_SB.SMB1", 0x00,
2828
ResourceConsumer,,)
2929
}
3030

@@ -37,7 +37,7 @@ which corresponds to the following ASL::
3737
Name (_HID, ...)
3838
Name (_CRS, ResourceTemplate () {
3939
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
40-
AddressingMode7Bit, "^CH00", 0x00,
40+
AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,
4141
ResourceConsumer,,)
4242
}
4343
}
@@ -52,7 +52,7 @@ which corresponds to the following ASL::
5252
Name (_HID, ...)
5353
Name (_CRS, ResourceTemplate () {
5454
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
55-
AddressingMode7Bit, "^CH01", 0x00,
55+
AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,
5656
ResourceConsumer,,)
5757
}
5858
}

Documentation/netlink/specs/ethtool.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,16 +1682,16 @@ operations:
16821682

16831683
do: &module-eeprom-get-op
16841684
request:
1685-
attributes:
1686-
- header
1687-
reply:
16881685
attributes:
16891686
- header
16901687
- offset
16911688
- length
16921689
- page
16931690
- bank
16941691
- i2c-address
1692+
reply:
1693+
attributes:
1694+
- header
16951695
- data
16961696
dump: *module-eeprom-get-op
16971697
-

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 = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 39
4+
SUBLEVEL = 43
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/arm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ config ARM
119119
select HAVE_KERNEL_XZ
120120
select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M
121121
select HAVE_KRETPROBES if HAVE_KPROBES
122-
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if (LD_VERSION >= 23600 || LD_CAN_USE_KEEP_IN_OVERLAY)
122+
select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if (LD_VERSION >= 23600 || LD_IS_LLD) && LD_CAN_USE_KEEP_IN_OVERLAY
123123
select HAVE_MOD_ARCH_SPECIFIC
124124
select HAVE_NMI
125125
select HAVE_OPTPROBES if !THUMB2_KERNEL

arch/arm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ endif
149149
# Need -Uarm for gcc < 3.x
150150
KBUILD_CPPFLAGS +=$(cpp-y)
151151
KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
152-
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float
152+
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include $(srctree)/arch/arm/include/asm/unified.h -msoft-float
153153

154154
CHECKFLAGS += -D__arm__
155155

arch/arm/boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@
168168
pinctrl-0 = <&pinctrl_uart2>;
169169
linux,rs485-enabled-at-boot-time;
170170
rs485-rx-during-tx;
171-
rs485-rts-active-low;
172171
uart-has-rtscts;
173172
status = "okay";
174173
};

arch/arm/boot/dts/nxp/vf/vfxxx.dtsi

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

605605
ftm: ftm@400b8000 {
606606
compatible = "fsl,ftm-timer";
607-
reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
607+
reg = <0x400b8000 0x1000>, <0x400b9000 0x1000>;
608608
interrupts = <44 IRQ_TYPE_LEVEL_HIGH>;
609609
clock-names = "ftm-evt", "ftm-src",
610610
"ftm-evt-counter-en", "ftm-src-counter-en";

0 commit comments

Comments
 (0)