Skip to content

Commit aa4b455

Browse files
committed
Merge tag 'v6.18.17' into 6.18-main
Linux 6.18.17 # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmmyoKgACgkQ3qZv95d3 # LNyqdhAArtoQvJyWbwIDJaHi5L3piHao7FekREIsGDtgHP6V2bI8GQzr14vcv8b0 # qr9aa6ahf9CFtn83LX/CMmxXSw4mb7MIW9i4uPJamG8PQKhpaBVos4gmc+D/5MKy # aeFlJekeWnR4W375LpMC6d2poLM1+FbSzC5LRjMnI1h7Rwal6FQrqq9S7fS1NAKm # OUybE6dWH9xojabe5K/MTRG8Hxtva53xeSaJJPXAwfLQkH8O17vAxP1BCmy4NBvV # bzbzPxRU2CbKITyhzV933IC0UccaX1MgnPVaQrnn39DXMdm3IVnIjvx3CFeSQnIP # 9qlGtsAMqVg/RtQAJBEhzyOii35Aekkj/K2/dkWZbOh4hyj1DBFaFI2SQisINuya # 8BW6HP0ZENuud+GzA0shcDKds3hLwHwkeHFJpbVo9TYS203qHoV5e9peUol1O3Ae # LPiHmCMmZxpZAyhVtsQCKus8LRJy3VQ6siShVcdv/18zhM9PthFehM9i5eADYvIZ # zSO74tK/TSN9AkTT+81nOcYkijohxb6DfEq4NkpqrRa5nkKtQsLds1sBTpEWwBD9 # BiMESPuuIwclDD/Bg8lgk5+eBlbAHGuYO7EvpZxJU7QgdHyqaO0Zk3dWyGTaMpNc # a0vTt6Kc0v38Gu3WItXaI4uOi6SB78zbe1f3vETLpFHlDoNoNjI= # =GWKa # -----END PGP SIGNATURE----- # gpg: Signature made Thu Mar 12 12:16:56 2026 CET # gpg: using RSA key E27E5D8A3403A2EF66873BBCDEA66FF797772CDC # gpg: Can't check signature: No public key
2 parents 3b269e1 + 93ea7e1 commit aa4b455

397 files changed

Lines changed: 4407 additions & 2109 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/hwmon/aht10.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ Supported chips:
2020

2121
English: http://www.aosong.com/userfiles/files/media/Data%20Sheet%20AHT20.pdf
2222

23+
* Aosong DHT20
24+
25+
Prefix: 'dht20'
26+
27+
Addresses scanned: None
28+
29+
Datasheet: https://www.digikey.co.nz/en/htmldatasheets/production/9184855/0/0/1/101020932
30+
2331
Author: Johannes Cornelis Draaijer <jcdra1@gmail.com>
2432

2533

@@ -33,7 +41,7 @@ The address of this i2c device may only be 0x38
3341
Special Features
3442
----------------
3543

36-
AHT20 has additional CRC8 support which is sent as the last byte of the sensor
44+
AHT20, DHT20 has additional CRC8 support which is sent as the last byte of the sensor
3745
values.
3846

3947
Usage Notes

Documentation/sound/alsa-configuration.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2372,6 +2372,10 @@ quirk_flags
23722372
audible volume
23732373
* bit 25: ``mixer_capture_min_mute``
23742374
Similar to bit 24 but for capture streams
2375+
* bit 26: ``skip_iface_setup``
2376+
Skip the probe-time interface setup (usb_set_interface,
2377+
init_pitch, init_sample_rate); redundant with
2378+
snd_usb_endpoint_prepare() at stream-open time
23752379

23762380
This module supports multiple devices, autoprobe and hotplugging.
23772381

Documentation/virt/kvm/api.rst

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7800,8 +7800,10 @@ Will return -EBUSY if a VCPU has already been created.
78007800

78017801
Valid feature flags in args[0] are::
78027802

7803-
#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)
7804-
#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)
7803+
#define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0)
7804+
#define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1)
7805+
#define KVM_X2APIC_ENABLE_SUPPRESS_EOI_BROADCAST (1ULL << 2)
7806+
#define KVM_X2APIC_DISABLE_SUPPRESS_EOI_BROADCAST (1ULL << 3)
78057807

78067808
Enabling KVM_X2APIC_API_USE_32BIT_IDS changes the behavior of
78077809
KVM_SET_GSI_ROUTING, KVM_SIGNAL_MSI, KVM_SET_LAPIC, and KVM_GET_LAPIC,
@@ -7814,6 +7816,28 @@ as a broadcast even in x2APIC mode in order to support physical x2APIC
78147816
without interrupt remapping. This is undesirable in logical mode,
78157817
where 0xff represents CPUs 0-7 in cluster 0.
78167818

7819+
Setting KVM_X2APIC_ENABLE_SUPPRESS_EOI_BROADCAST instructs KVM to enable
7820+
Suppress EOI Broadcasts. KVM will advertise support for Suppress EOI
7821+
Broadcast to the guest and suppress LAPIC EOI broadcasts when the guest
7822+
sets the Suppress EOI Broadcast bit in the SPIV register. This flag is
7823+
supported only when using a split IRQCHIP.
7824+
7825+
Setting KVM_X2APIC_DISABLE_SUPPRESS_EOI_BROADCAST disables support for
7826+
Suppress EOI Broadcasts entirely, i.e. instructs KVM to NOT advertise
7827+
support to the guest.
7828+
7829+
Modern VMMs should either enable KVM_X2APIC_ENABLE_SUPPRESS_EOI_BROADCAST
7830+
or KVM_X2APIC_DISABLE_SUPPRESS_EOI_BROADCAST. If not, legacy quirky
7831+
behavior will be used by KVM: in split IRQCHIP mode, KVM will advertise
7832+
support for Suppress EOI Broadcasts but not actually suppress EOI
7833+
broadcasts; for in-kernel IRQCHIP mode, KVM will not advertise support for
7834+
Suppress EOI Broadcasts.
7835+
7836+
Setting both KVM_X2APIC_ENABLE_SUPPRESS_EOI_BROADCAST and
7837+
KVM_X2APIC_DISABLE_SUPPRESS_EOI_BROADCAST will fail with an EINVAL error,
7838+
as will setting KVM_X2APIC_ENABLE_SUPPRESS_EOI_BROADCAST without a split
7839+
IRCHIP.
7840+
78177841
7.8 KVM_CAP_S390_USER_INSTR0
78187842
----------------------------
78197843

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 = 18
4-
SUBLEVEL = 16
4+
SUBLEVEL = 17
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

arch/alpha/kernel/vmlinux.lds.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ SECTIONS
7171

7272
STABS_DEBUG
7373
DWARF_DEBUG
74+
MODINFO
7475
ELF_DETAILS
7576

7677
DISCARDS

arch/arc/kernel/vmlinux.lds.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ SECTIONS
123123
_end = . ;
124124

125125
STABS_DEBUG
126+
MODINFO
126127
ELF_DETAILS
127128
DISCARDS
128129

arch/arm/boot/compressed/vmlinux.lds.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SECTIONS
2121
COMMON_DISCARDS
2222
*(.ARM.exidx*)
2323
*(.ARM.extab*)
24+
*(.modinfo)
2425
*(.note.*)
2526
*(.rel.*)
2627
*(.printk_index)

arch/arm/boot/dts/nxp/imx/imx53-usbarmory.dts

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,10 @@
1+
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
12
/*
23
* USB armory MkI device tree file
34
* https://inversepath.com/usbarmory
45
*
56
* Copyright (C) 2015, Inverse Path
67
* Andrej Rosano <andrej@inversepath.com>
7-
*
8-
* This file is dual-licensed: you can use it either under the terms
9-
* of the GPL or the X11 license, at your option. Note that this dual
10-
* licensing only applies to this file, and not this project as a
11-
* whole.
12-
*
13-
* a) This file is free software; you can redistribute it and/or
14-
* modify it under the terms of the GNU General Public License as
15-
* published by the Free Software Foundation; either version 2 of the
16-
* License, or (at your option) any later version.
17-
*
18-
* This file is distributed in the hope that it will be useful,
19-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
* GNU General Public License for more details.
22-
*
23-
* Or, alternatively,
24-
*
25-
* b) Permission is hereby granted, free of charge, to any person
26-
* obtaining a copy of this software and associated documentation
27-
* files (the "Software"), to deal in the Software without
28-
* restriction, including without limitation the rights to use,
29-
* copy, modify, merge, publish, distribute, sublicense, and/or
30-
* sell copies of the Software, and to permit persons to whom the
31-
* Software is furnished to do so, subject to the following
32-
* conditions:
33-
*
34-
* The above copyright notice and this permission notice shall be
35-
* included in all copies or substantial portions of the Software.
36-
*
37-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
38-
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
39-
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
40-
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
41-
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
42-
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
43-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
44-
* OTHER DEALINGS IN THE SOFTWARE.
458
*/
469

4710
/dts-v1/;

arch/arm/include/asm/string.h

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,17 @@ static inline void *memset32(uint32_t *p, uint32_t v, __kernel_size_t n)
3939
}
4040

4141
#define __HAVE_ARCH_MEMSET64
42-
extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi);
42+
extern void *__memset64(uint64_t *, uint32_t first, __kernel_size_t, uint32_t second);
4343
static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n)
4444
{
45-
if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))
46-
return __memset64(p, v, n * 8, v >> 32);
47-
else
48-
return __memset64(p, v >> 32, n * 8, v);
45+
union {
46+
uint64_t val;
47+
struct {
48+
uint32_t first, second;
49+
};
50+
} word = { .val = v };
51+
52+
return __memset64(p, word.first, n * 8, word.second);
4953
}
5054

5155
/*

arch/arm/kernel/vmlinux-xip.lds.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ SECTIONS
154154

155155
STABS_DEBUG
156156
DWARF_DEBUG
157+
MODINFO
157158
ARM_DETAILS
158159

159160
ARM_ASSERTS

0 commit comments

Comments
 (0)