Skip to content

Commit f802f11

Browse files
author
Wolfram Sang
committed
Merge tag 'i2c-host-fixes-6.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
i2c-host-fixes for v6.13-rc5 - IMX: fixed stop condition in single master mode and added compatible string for errata adherence. - Microchip: Added support for proper repeated sends and fixed unnecessary NAKs on empty messages, which caused false bus detection.
2 parents 78d4f34 + 49e1f0f commit f802f11

File tree

278 files changed

+3971
-1600
lines changed

Some content is hidden

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

278 files changed

+3971
-1600
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,7 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
735735
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
736736
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
737737
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
738+
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
738739
Yusuke Goda <goda.yusuke@renesas.com>
739740
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
740741
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

Documentation/admin-guide/pm/amd-pstate.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ performance supported in `AMD CPPC Performance Capability <perf_cap_>`_).
251251
In some ASICs, the highest CPPC performance is not the one in the ``_CPC``
252252
table, so we need to expose it to sysfs. If boost is not active, but
253253
still supported, this maximum frequency will be larger than the one in
254-
``cpuinfo``. On systems that support preferred core, the driver will have
255-
different values for some cores than others and this will reflect the values
256-
advertised by the platform at bootup.
254+
``cpuinfo``.
257255
This attribute is read-only.
258256

259257
``amd_pstate_lowest_nonlinear_freq``

Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ patternProperties:
114114
table that specifies the PPID to LIODN mapping. Needed if the PAMU is
115115
used. Value is a 12 bit value where value is a LIODN ID for this JR.
116116
This property is normally set by boot firmware.
117-
$ref: /schemas/types.yaml#/definitions/uint32
118-
maximum: 0xfff
117+
$ref: /schemas/types.yaml#/definitions/uint32-array
118+
items:
119+
- maximum: 0xfff
119120

120121
'^rtic@[0-9a-f]+$':
121122
type: object
@@ -186,8 +187,9 @@ patternProperties:
186187
Needed if the PAMU is used. Value is a 12 bit value where value
187188
is a LIODN ID for this JR. This property is normally set by boot
188189
firmware.
189-
$ref: /schemas/types.yaml#/definitions/uint32
190-
maximum: 0xfff
190+
$ref: /schemas/types.yaml#/definitions/uint32-array
191+
items:
192+
- maximum: 0xfff
191193

192194
fsl,rtic-region:
193195
description:

Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ examples:
8282
8383
uimage@100000 {
8484
reg = <0x0100000 0x200000>;
85-
compress = "lzma";
85+
compression = "lzma";
8686
};
8787
};
8888

Documentation/devicetree/bindings/soc/fsl/fsl,qman-portal.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ properties:
3535

3636
fsl,liodn:
3737
$ref: /schemas/types.yaml#/definitions/uint32-array
38+
maxItems: 2
3839
description: See pamu.txt. Two LIODN(s). DQRR LIODN (DLIODN) and Frame LIODN
3940
(FLIODN)
4041

@@ -69,6 +70,7 @@ patternProperties:
6970
type: object
7071
properties:
7172
fsl,liodn:
73+
$ref: /schemas/types.yaml#/definitions/uint32-array
7274
description: See pamu.txt, PAMU property used for static LIODN assignment
7375

7476
fsl,iommu-parent:

Documentation/mm/process_addrs.rst

Lines changed: 850 additions & 0 deletions
Large diffs are not rendered by default.

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7347,7 +7347,7 @@ F: drivers/gpu/drm/panel/panel-novatek-nt36672a.c
73477347
DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
73487348
M: Karol Herbst <kherbst@redhat.com>
73497349
M: Lyude Paul <lyude@redhat.com>
7350-
M: Danilo Krummrich <dakr@redhat.com>
7350+
M: Danilo Krummrich <dakr@kernel.org>
73517351
L: dri-devel@lists.freedesktop.org
73527352
L: nouveau@lists.freedesktop.org
73537353
S: Supported
@@ -8453,7 +8453,7 @@ F: include/video/s1d13xxxfb.h
84538453
EROFS FILE SYSTEM
84548454
M: Gao Xiang <xiang@kernel.org>
84558455
M: Chao Yu <chao@kernel.org>
8456-
R: Yue Hu <huyue2@coolpad.com>
8456+
R: Yue Hu <zbestahu@gmail.com>
84578457
R: Jeffle Xu <jefflexu@linux.alibaba.com>
84588458
R: Sandeep Dhavale <dhavale@google.com>
84598459
L: linux-erofs@lists.ozlabs.org
@@ -8924,7 +8924,7 @@ F: include/linux/arm_ffa.h
89248924
FIRMWARE LOADER (request_firmware)
89258925
M: Luis Chamberlain <mcgrof@kernel.org>
89268926
M: Russ Weight <russ.weight@linux.dev>
8927-
M: Danilo Krummrich <dakr@redhat.com>
8927+
M: Danilo Krummrich <dakr@kernel.org>
89288928
L: linux-kernel@vger.kernel.org
89298929
S: Maintained
89308930
F: Documentation/firmware_class/

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 13
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc3
5+
EXTRAVERSION = -rc4
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

arch/arc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
config ARC
77
def_bool y
88
select ARC_TIMERS
9+
select ARCH_HAS_CPU_CACHE_ALIASING
910
select ARCH_HAS_CACHE_LINE_SIZE
1011
select ARCH_HAS_DEBUG_VM_PGTABLE
1112
select ARCH_HAS_DMA_PREP_COHERENT

arch/arc/include/asm/cachetype.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef __ASM_ARC_CACHETYPE_H
3+
#define __ASM_ARC_CACHETYPE_H
4+
5+
#define cpu_dcache_is_aliasing() false
6+
#define cpu_icache_is_aliasing() true
7+
8+
#endif

0 commit comments

Comments
 (0)