summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
6 hoursMerge branch 'for-next' of https://github.com/hisilicon/linux-hisi.gitMark Brown
6 hoursMerge branch 'bitmap-for-next' of https://github.com/norov/linux.gitMark Brown
6 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git
6 hoursMerge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.gitMark Brown
# Conflicts: # arch/x86/kvm/x86.c
6 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
6 hoursMerge branch 'next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git
6 hoursMerge branch 'kexec-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git
6 hoursMerge branch 'master' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
6 hoursMerge branch 'next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
6 hoursMerge branch 'master' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
7 hoursMerge branch 'main' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git # Conflicts: # MAINTAINERS # tools/testing/selftests/net/lib.sh
7 hoursMerge branch 'next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
7 hoursMerge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.gitMark Brown
7 hoursMerge branch 'riscv-dt-for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git # Conflicts: # arch/riscv/Kconfig
7 hoursMerge branch 'linux-next' of https://github.com/c-sky/csky-linux.gitMark Brown
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
7 hoursMerge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.gitMark Brown
7 hoursMerge branch 'riscv-config-for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
7 hoursMerge branch 'sunxi/for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
7 hoursMerge branch 'next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git
7 hoursMerge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.gitMark Brown
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
7 hoursMerge branch 'for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git
7 hoursMerge branch 'kbuild-for-next' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git
7 hoursMerge branch 'mm-nonmm-unstable' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
7 hoursMerge branch 'mm-unstable' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
7 hoursMerge branch 'tip/urgent' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
7 hoursMerge branch 'fixes' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
7 hoursMerge branch 'fixes' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
7 hoursMerge branch 'master' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
7 hoursMerge branch 'for-next/fixes' of ↵Mark Brown
https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
10 hoursMerge branch into tip/master: 'x86/msr'Ingo Molnar
# New commits in x86/msr: 2db442843e4e ("x86/olpc: Stop using 32-bit MSR interfaces") f1b599106414 ("x86/hyperv: Stop using 32-bit MSR interfaces") cd5102479d29 ("hwmon: Stop using 32-bit MSR interfaces") 3e8ca6691e9d ("EDAC: Stop using 32-bit MSR interfaces") 2e9e6edbad45 ("x86/cpu: Stop using 32-bit MSR interfaces") 7920900e53dd ("x86/apic: Stop using 32-bit MSR interfaces") 4967c466ca38 ("x86/resctrl: Stop using 32-bit MSR interfaces") 4ff91f7b8fbf ("x86/tsc: Stop using 32-bit MSR interfaces") 9c6be5e78981 ("x86/amd: Stop using 32-bit MSR interfaces") b67096f9dbbb ("x86/pci: Stop using 32-bit MSR interfaces") c36c3d7e5dc4 ("x86/hygon: Stop using 32-bit MSR interfaces") cff219368bd0 ("x86/mce: Stop using 32-bit MSR interfaces") c69d7feb8d12 ("x86/msr: Stop using 32-bit MSR interfaces in lib/msr-smp.c") Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 hoursMerge branch into tip/master: 'x86/cleanups'Ingo Molnar
# New commits in x86/cleanups: db55777feca8 ("Documentation/arch/x86/amd-memory-encryption.rst: Fix typo") edeed06c2ba0 ("x86/platform/quark: Fix kernel-doc warnings in imr.c") c8e412f79db6 ("x86/ras: Move contents from arch/x86/ras/Kconfig into drivers/ras/Kconfig") 77d34d395093 ("x86/cpu: Move intel_get_platform_id() to cpu/intel.c") 324549c06ead ("x86/mm: Fix typo in comment") b47748678c6c ("x86/fpu: Fix kernel-doc formatting above fpu_enable_guest_xfd_features()") 0cfdf974f133 ("x86/cfi: Use symmetric SYM_START and SYM_END in __CFI_TYPE()") bed18bbbf9d9 ("x86/cfi: Add __init_or_module annotations for fineibt") Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 hoursMerge branch into tip/master: 'timers/vdso'Ingo Molnar
# New commits in timers/vdso: 369cecd238ac ("vdso/gettimeofday: Verify COMPAT_32BIT_TIME interactions") 2700297b69fe ("sparc: vdso: Respect COMPAT_32BIT_TIME") 377e3f2d4130 ("MIPS: VDSO: Respect COMPAT_32BIT_TIME") e01abc70af38 ("powerpc/vdso: Respect COMPAT_32BIT_TIME") 95216f4647e7 ("ARM: VDSO: Respect COMPAT_32BIT_TIME") abb1537388ba ("arm64: vdso32: Respect COMPAT_32BIT_TIME") 1a4660da3130 ("x86/vdso: Respect COMPAT_32BIT_TIME") f8b946772554 ("vdso/gettimeofday: Validate system call existence for time() and gettimeofday()") dce21fb3d570 ("time: Respect COMPAT_32BIT_TIME for old time type functions") 0b50763e8439 ("vdso/datastore: Simplify the mapping logic for VDSO_TIME_PAGE_OFFSET") c27e727c9a60 ("vdso/datastore: Allow prefaulting by mlockall()") 9ab500d47f5f ("vdso/datastore: Explicitly prevent remote access to timens vvar page") 43648f9f3a67 ("vdso/datastore: Map zeroed pages for unavailable data") 7557273419dd ("vdso/datastore: Map pages in terms of the faults pgoff") ff868f43eb8f ("vdso/datastore: Rename data pages variable") 02475538bec2 ("vdso: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files") Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 hoursMerge branch into tip/master: 'timers/core'Ingo Molnar
# New commits in timers/core: aca60c717492 ("selftests: timers: Partially revert "Remove local NSEC_PER_SEC and USEC_PER_SEC defines"") f5abf0e07894 ("ntp: Remove tick_length_base, use tick_length directly") c10c8c1ad90c ("timekeeping: Settle competing time_offset and time_adjust skew") f5adb6779968 ("timekeeping: Drive time_adjust skew via per-tick ntp_error transfer") 5f6668bf5b06 ("timekeeping: Drive time_offset skew via per-tick ntp_error transfer") e8bf3955dc2f ("timekeeping: Account for clocksource tick quantisation via NTP") b7befd6d9120 ("timekeeping: Account for monotonicity adjustment in ntp_error") 79b8bd857bd7 ("MAINTAINERS: Add Miroslav as timekeeping reviewer") 79ced850e549 ("y2038: uapi: Use 64-bit __kernel_old_timespec::tv_nsec on x32") 79bd39c58f2c ("timekeeping: Move the vDSO update declarations into a private header") 6e435911394b ("timekeeping: Fold vdso_time_update_aux() declarations into the generic ifdeffery") faef65e45a2a ("hrtimer: Remove inclusion of hrtimer_bases.h remove from hrtimer.h") 0c31af3d23e6 ("x86/speculation: Explicitly include linux/types.h") 071993aac72e ("hrtimer: Explicitly include some necessary headers in hrtimer_rearm.h") 95cf8bbadd10 ("hrtimer: Explicitly include linux/hrtimer_bases.h") 73fcec09d162 ("tick: Explicitly include linux/hrtimer_bases.h") a116c7582d7f ("hrtimer: Move hrtimer_update_function() to hrtimer.c") d3dc7fabd4c4 ("hrtimer: Move hrtimer_callback_running() to hrtimer_bases.h") 03b5d4c27982 ("hrtimer: Rename hrtimer_defs.h to hrtimer_bases.h") c4415c993fc2 ("hrtimer: Don't take cpu_base::lock in hrtimer_get_next_event() when hres_active") 1d28a67d496f ("timer_list: Annotate print_cpu() diagnostic reads") 06aba58e5849 ("time/namespace: Validate nanosecond field in proc_timens_set_offset()") eddfded41965 ("timers/migration: Fix memory leak in tmigr_setup_groups() error path") f2eee7e31ccd ("timekeeping: Unwind aux clock sysfs children on failure") 3dee6537e728 ("clocksource: Unregister subsystem on device registration failure") b4b66151a714 ("selftests: timers: leap-a-day: Fix -w option and update usage comment") b3afded935a8 ("clocksource: Remove unused WATCHDOG_INTERVAL_NS macro") d8966ca88566 ("hrtimer: Remove unused next_timer argument from __hrtimer_reprogram()") e2904ddb14a4 ("timekeeping: Document monotonic raw timestamps in snapshots correctly") a73d7f98e41a ("posix-cpu-timers: Don't abuse lock_task_sighand() in handle_posix_cpu_timers()") 034b5779b85b ("hrtimer: Remove unused clock_base_next_timer_safe()") Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 hoursMerge branch into tip/master: 'irq/core'Ingo Molnar
# New commits in irq/core: 2c27d9b15474 ("parisc: Remove unnecessary NULL check of the kstat_irqs field") 57d12209790d ("genirq: Remove unnecessary NULL check of the kstat_irqs field") 491ee67755dd ("irqdomain: Remove unnedded NULL check in __irq_domain_[de]activate_irq()") c5a0cfa07cee ("genirq/manage: Use irqd_get_parent_data() helper in __irq_get_irqchip_state()") 13856e22217f ("irqdomain: Plug leak in irq_domain_alloc_irqs_locked() error path") Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 hoursMerge branch into tip/master: 'core/entry'Ingo Molnar
# New commits in core/entry: 5b6e32ba7b59 ("syscall_user_dispatch: Add kernel.syscall_user_dispatch sysctl") ee935e8dc757 ("syscall_user_dispatch: Make it configurable in Kconfig") Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 hoursMerge branch into tip/master: 'perf/merge'Ingo Molnar
# New commits in perf/merge: 3eaa50e1e255 ("x86/cpu: Hide and rename static_cpu_has()") edda9051e267 ("perf/x86/amd/uncore: Add group validation") d7ebbae57de3 ("selftests/bpf: Add tests for forked/cloned optimized uprobes") eccf368562bb ("selftests/bpf: Add tests for uprobe nop10 red zone clobbering") 28d57db3e8d4 ("selftests/bpf: Add reattach tests for uprobe syscall") b2cf7c41e4f1 ("selftests/bpf: Change uprobe/usdt trigger bench code to use nop10") ec0596a02083 ("selftests/bpf: Change uprobe syscall tests to use nop10") 6d91200bcbb5 ("selftests/bpf: Emit nop,nop10 instructions combo for x86_64 arch") 8cae54c58608 ("libbpf: Detect uprobe syscall with new error") ee2862439e5c ("libbpf: Change has_nop_combo to work on top of nop10") 554ba38456da ("uprobes/x86: Move optimized uprobe from nop5 to nop10") d9a48e77f6fe ("uprobes/x86: Allow to copy uprobe trampolines on fork") 07c308eb2bcf ("uprobes/x86: Do not leak trampoline vma mapping on optimization failure") 38af0dd6a266 ("uprobes/x86: Remove struct uprobe_trampoline object") a4573a3838ae ("perf/core: Check kernel access when kernel callchains are requested") 166f10836a65 ("perf/core: Fix kernel register info leak via hardware skid") a6b5fbc33172 ("perf/x86/intel: Drop fixed-counter PEBS constraints for baseline PEBS") 01c153956b44 ("perf/x86/intel: Validate the return value of intel_pmu_init_hybrid()") e2b0575900ff ("perf/x86/intel: Fix kernel address leakages in LBR stack") 170cc6b02e3d ("perf/x86/intel: Fallback to sw branch type decoding if no hw decoding") 3c4ec9b2a5db ("perf/x86/intel: Keep cap_user_rdpmc in sync with RDPMC user-disable state") 8767b4d73018 ("perf/x86/intel: Remove anythread_deprecated bit from perf_capabilities") b25813b17944 ("perf/x86/intel/uncore: Implement lazy setup for MSR/MMIO PMUs") 174f0582e38a ("perf/x86/intel/uncore: Fix uncore_box ref/unref ordering") 30c0a1095652 ("perf/x86/intel/uncore: Introduce PMU flags and broken state") ae7ca8796dda ("perf/x86/intel/uncore: Factor out box setup code") 3012af7df343 ("perf/x86/intel/uncore: Keep PCI PMUs working when MMIO/MSR setup fails") cbbc25209ce3 ("perf/x86/intel/uncore: Let init_box() callback report failures") 7d3a9ff98898 ("perf/x86/intel/uncore: Fix refcnt and other cleanups") 003267cb94e2 ("perf/x86/intel/uncore: Fix PCI PMU cleanup on setup failure") Signed-off-by: Ingo Molnar <mingo@kernel.org>