Ingo Molnar 05453d36a2 Merge branch 'linus' into x86/cleanups, to resolve conflict ...

These two commits interact:

 upstream:     73da582a47 ("x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC")
 x86/cleanups: 13148e22c1 ("x86/apic: Remove "disablelapic" cmdline option")

Resolve it.

 Conflicts:
	arch/x86/kernel/cpu/topology.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2024-12-10 19:33:03 +01:00

..

ABI

Merge tag 'linux-watchdog-6.13-rc1' of git://www.linux-watchdog.org/linux-watchdog

2024-12-05 10:03:43 -08:00

accel

accel/qaic: Add AIC080 support

2024-10-12 14:51:04 -06:00

accounting

…

admin-guide

Merge branch 'linus' into x86/cleanups, to resolve conflict

2024-12-10 19:33:03 +01:00

arch

Merge branch 'linus' into x86/cleanups, to resolve conflict

2024-12-10 19:33:03 +01:00

block

Documentation: ublk: document UBLK_F_USER_RECOVERY_FAIL_IO

2024-10-22 08:16:40 -06:00

bpf

bpf: Remove trailing whitespace in verifier.rst

2024-11-11 08:17:48 -08:00

cdrom

…

core-api

module: Convert default symbol namespace to string literal

2024-12-03 08:22:25 -08:00

cpu-freq

…

crypto

crypto: doc - Fix akcipher title reference

2024-10-10 17:08:02 +08:00

dev-tools

Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2024-11-30 13:41:50 -08:00

devicetree

Merge tag 'pmdomain-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm

2024-12-06 11:24:00 -08:00

doc-guide

Documentation: kernel-doc: enumerate identifier *type*s

2024-11-22 10:37:40 -07:00

driver-api

Merge tag 'driver-core-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2024-11-29 11:43:29 -08:00

fault-injection

net: Implement fault injection forcing skb reallocation

2024-11-12 12:05:33 +01:00

fb

…

features

riscv: Add qspinlock support

2024-11-11 07:33:20 -08:00

filesystems

Merge tag 'vfs-6.13-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

2024-11-27 08:11:46 -08:00

firmware_class

…

firmware-guide

…

fpga

…

gpu

drm/amdgpu: Add documentation for enforce isolation feature

2024-11-08 11:45:29 -05:00

hid

Documentation: hid: intel-ish-hid: Add vendor custom firmware loading

2024-08-19 21:12:27 +02:00

hwmon

hwmon: (tmp108) Add NXP p3t1085 support

2024-11-12 13:54:55 -08:00

i2c

Merge tag 'i2c-host-6.13-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow

2024-11-18 08:35:47 +01:00

iio

docs: iio: ad7380: add adaq4370-4 and adaq4380-4

2024-11-09 10:42:03 +00:00

images

…

infiniband

…

input

Input: fix the input_event struct documentation

2024-11-14 18:03:23 -08:00

isdn

…

kbuild

Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2024-11-30 13:41:50 -08:00

kernel-hacking

docs/licensing: Clarify wording about "GPL" and "Proprietary"

2024-11-22 10:44:25 -07:00

leds

Merge tag 'leds-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds

2024-09-23 14:20:11 -07:00

litmus-tests

…

livepatch

Documentation: livepatch: Correct release locks antonym

2024-09-04 13:42:27 +02:00

locking

locking/Documentation: Fix grammar in percpu-rw-semaphore.rst

2024-11-13 10:59:01 +01:00

maintainer

docs: Remove redundant word "for"

2024-10-21 09:32:20 -06:00

mhi

…

misc-devices

…

mm

Merge tag 'slab-for-6.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab

2024-11-25 16:51:24 -08:00

netlabel

…

netlink

net: Add napi_struct parameter irq_suspend_timeout

2024-11-11 18:45:05 -08:00

networking

docs: net: bareudp: fix spelling and grammar mistakes

2024-11-30 13:54:28 -08:00

nvdimm

…

nvme

Remove duplicate "and" in 'Linux NVMe docs.

2024-09-10 15:44:20 -06:00

PCI

Merge branch 'pci/endpoint'

2024-11-25 13:40:56 -06:00

pcmcia

…

peci

…

power

Documentation: PM: Discourage use of deprecated macros

2024-09-04 14:37:57 +02:00

process

Merge tag 'docs-6.13-2' of git://git.lwn.net/linux

2024-11-26 13:44:27 -08:00

RCU

doc: rcu: update printed dynticks counter bits

2024-11-12 21:40:24 +01:00

rust

Merge tag 'rust-6.13' of https://github.com/Rust-for-Linux/linux

2024-11-26 14:00:26 -08:00

scheduler

sched_ext: Rename scx_bpf_consume() to scx_bpf_dsq_move_to_local()

2024-11-11 07:06:16 -10:00

scsi

…

security

landlock: Fix grammar issues in documentation

2024-10-21 20:36:26 +02:00

sound

Merge tag 'asoc-fix-v6.13-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

2024-11-28 14:55:21 +01:00

sphinx

docs: kerneldoc-preamble.sty: Suppress extra spaces in CJK literal blocks

2024-09-05 14:16:41 -06:00

sphinx-static

…

spi

spi: Enable controllers to extend the SPI protocol with MOSI idle configuration

2024-07-29 01:19:51 +01:00

staging

Documentation: Fix incorrect paths/magic in magic numbers rst

2024-11-04 12:34:59 -07:00

target

…

tee

…

timers

timers/Documentation: Cleanup delay/sleep documentation

2024-10-16 00:36:48 +02:00

tools

rtla: Documentation: Mention --deepest-idle-state

2024-10-17 17:13:16 -04:00

trace

tracing: Record task flag NEED_RESCHED_LAZY.

2024-11-22 17:49:39 -05:00

translations

module: Convert default symbol namespace to string literal

2024-12-03 08:22:25 -08:00

usb

usb: gadget: f_uac1: Change volume name and remove alt names

2024-08-13 18:11:35 +02:00

userspace-api

Merge tag 'drm-next-2024-11-21' of https://gitlab.freedesktop.org/drm/kernel

2024-11-21 14:56:17 -08:00

virt

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2024-11-23 16:00:50 -08:00

w1

…

watchdog

watchdog: Delete the cpu5wdt driver

2024-11-05 10:04:39 +01:00

wmi

Merge tag 'platform-drivers-x86-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

2024-11-20 14:07:55 -08:00

.gitignore

…

atomic_bitops.txt

…

atomic_t.txt

…

Changes

…

CodingStyle

…

conf.py

…

docutils.conf

…

index.rst

…

Kconfig

…

Makefile

…

memory-barriers.txt

docs/memory-barriers.txt: Remove left-over references to "CACHE COHERENCY"

2024-09-13 23:56:44 -07:00

SubmittingPatches

…

subsystem-apis.rst

…