diff options
| author | Minas Hambardzumyan <minas@ti.com> | 2021-06-09 15:55:35 -0500 |
|---|---|---|
| committer | Minas Hambardzumyan <minas@ti.com> | 2021-06-09 15:55:35 -0500 |
| commit | d75d9f4656d9dd90c866f2317eaa18f2858ad9db (patch) | |
| tree | 8a8c7724d4ac1428ac2b4b41a08c46b6671a5459 /scripts/kconfig | |
| parent | 30e2abf77fce04c08e2813af45d6af7aee4c42bf (diff) | |
| parent | 33069919e2dce440d3b8cd101b18f37bb35bdddf (diff) | |
Merge tag 'v5.10.41' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into ti-linux-5.10.y
This is the 5.10.41 stable release
* tag 'v5.10.41' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: (1282 commits)
Linux 5.10.41
NFC: nci: fix memory leak in nci_allocate_device
perf unwind: Set userdata for all __report_module() paths
perf unwind: Fix separate debug info files when using elfutils' libdw's unwinder
KVM: x86: Defer vtime accounting 'til after IRQ handling
context_tracking: Move guest exit vtime accounting to separate helpers
context_tracking: Move guest exit context tracking to separate helpers
bpf: No need to simulate speculative domain for immediates
bpf: Fix mask direction swap upon off reg sign change
bpf: Wrap aux data inside bpf_sanitize_info container
Linux 5.10.40
Bluetooth: SMP: Fail if remote and local public keys are identical
video: hgafb: correctly handle card detect failure during probe
nvmet: use new ana_log_size instead the old one
x86/boot/compressed/64: Check SEV encryption in the 32-bit boot-path
rtc: pcf85063: fallback to parent of_node
nvme-multipath: fix double initialization of ANA state
x86/Xen: swap NX determination and GDT setup on BSP
openrisc: mm/init.c: remove unused memblock_region variable in map_ram()
drm/i915/gt: Disable HiZ Raw Stall Optimization on broken gen7
...
Signed-off-by: Minas Hambardzumyan <minas@ti.com>
# Conflicts:
# drivers/pci/controller/dwc/pci-keystone.c
# drivers/pci/endpoint/functions/pci-epf-test.c
# drivers/pci/endpoint/pci-epc-core.c
# drivers/phy/ti/phy-j721e-wiz.c
# include/linux/pci-epc.h
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/nconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index e0f965529166..af814b39b876 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -504,8 +504,8 @@ static int get_mext_match(const char *match_str, match_f flag) else if (flag == FIND_NEXT_MATCH_UP) --match_start; + match_start = (match_start + items_num) % items_num; index = match_start; - index = (index + items_num) % items_num; while (true) { char *str = k_menu_items[index].str; if (strcasestr(str, match_str) != NULL) |