diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-28 17:05:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-28 17:05:22 -0800 |
| commit | 7a5668899f54f6c9fe8619ecec23fb682d463f4a (patch) | |
| tree | 1b56ab5ef4168798376458a1d4214e5ebb703b00 /drivers/media/video/marvell-ccic | |
| parent | d203484f2556f47a435cda36ceb9dd83adc9056e (diff) | |
| parent | 0f6750b15ffdf274668b12824b09bd49ea854e18 (diff) | |
| download | linux-master.tar.gz linux-master.tar.bz2 linux-master.zip | |
Merge tag 'x86-urgent-2025-02-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipHEADmaster
Pull x86 fixes from Ingo Molnar:
- Fix conflicts between devicetree and ACPI SMP discovery & setup
- Fix a warm-boot lockup on AMD SC1100 SoC systems
- Fix a W=1 build warning related to x86 IRQ trace event setup
- Fix a kernel-doc warning
* tag 'x86-urgent-2025-02-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/entry: Fix kernel-doc warning
x86/irq: Define trace events conditionally
x86/CPU: Fix warm boot hang regression on AMD SC1100 SoC systems
x86/of: Don't use DTB for SMP setup if ACPI is enabled
Diffstat (limited to 'drivers/media/video/marvell-ccic')
0 files changed, 0 insertions, 0 deletions