-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Hi Linus,
Please pull powerpc updates for 6.6.
There's a conflict in drivers/net/ethernet/freescale/fs_enet/fs_enet.h, where
the correct resolution is to drop the include of both linux/fs_enet_pd.h and
asm/fs_pd.h.
There's a trivial conflict in arch/powerpc/Kconfig.
There will be a conflict when you merge the tty tree, in
arch/powerpc/include/asm/fs_pd.h,
the resolution is just to take the union of all the removals leaving the file
almost empty and unused, we will remove it in a follow-up patch.
Notable out of area changes:
include/linux/hw_breakpoint.h # 53834a0c0925 perf/hw_breakpoint: Remove arch
breakpoint hooks
kernel/events/hw_breakpoint.c # 53834a0c0925 perf/hw_breakpoint: Remove arch
breakpoint hooks
drivers/net/ethernet/freescale/fs_enet/fs_enet.h # 60bc069c433f
powerpc/include: Remove unneeded #include
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c # fecc436a97af
powerpc/include: Remove mpc8260.h and m82xx_pci.h
cheers
The following changes since commit 6eaae198076080886b9e7d57f4ae06fa782f90ef:
Linux 6.5-rc3 (2023-07-23 15:24:10 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
tags/powerpc-6.6-1
for you to fetch changes up to 85a616416e9e01db0bfa92f26457e92642e2236b:
macintosh/ams: linux/platform_device.h is needed (2023-08-31 21:23:13 +1000)
- --
powerpc updates for 6.6
- Add HOTPLUG_SMT support (/sys/devices/system/cpu/smt) and honour the
configured SMT state when hotplugging CPUs into the system.
- Combine final TLB flush and lazy TLB mm shootdown IPIs when using the Radix
MMU to avoid a broadcast TLBIE flush on exit.
- Drop the exclusion between ptrace/perf watchpoints, and drop the now unused
associated arch hooks.
- Add support for the "nohlt" command line option to disable CPU idle.
- Add support for -fpatchable-function-entry for ftrace, with GCC >= 13.1.
- Rework memory block size determination, and support 256MB size on systems
with GPUs that have hotpluggable memory.
- Various other small features and fixes.
Thanks to: Andrew Donnellan, Aneesh Kumar K.V, Arnd Bergmann, Athira Rajeev,
Benjamin Gray, Christophe Leroy, Frederic Barrat, Gautam Menghani, Geoff Levand,
Hari Bathini, Immad Mir, Jialin Zhang, Joel Stanley, Jordan Niethe, Justin
Stitt, Kajol Jain, Kees Cook, Krzysztof Kozlowski, Laurent Dufour, Liang He,
Linus Walleij, Mahesh Salgaonkar, Masahiro Yamada, Michal Suchanek, Nageswara
R Sastry, Nathan Chancellor, Nathan Lynch, Naveen N Rao, Nicholas Piggin, Nick
Desaulniers, Omar Sandoval, Randy Dunlap, Reza Arbab, Rob Herring, Russell
Currey, Sourabh Jain, Thomas Gleixner, Trevor Woerner, Uwe Kleine-König, Vaibhav
Jain, Xiongfeng Wang, Yuan Tan, Zhang Rui, Zheng Zengkai.
- --
Aneesh Kumar K.V (3):
powerpc/mm: Cleanup memory block size probing
powerpc/mm/book3s64: Fix build error with SPARSEMEM disabled
powerpc/mm/book3s64: Use 256M as the upper limit with coherent device
memory attached
Arnd Bergmann (4):
powerpc: address missing-prototypes warnings
powerpc: mark more local variables as volatile
powerpc: xmon: remove unused variables
macintosh/ams: mark ams_init() static
Benjamin Gray (11):
selftests/powerpc/ptrace: Explain why tests are skipped
selftests/powerpc/ptrace: Fix typo in pid_max search error
selftests/powerpc/ptrace: Declare test temporary variables as volatile
powerpc/watchpoints: Explain thread_change_pc() more
powerpc/watchpoints: Don't track info persistently
powerpc/watchpoints: Track perf single step directly on the breakpoint
powerpc/watchpoints: Simplify watchpoint reinsertion
powerpc/watchpoints: Remove ptrace/perf exclusion tracking
selftests/powerpc/ptrace: Update ptrace-perf watchpoint selftest
perf/hw_breakpoint: Remove arch breakpoint hooks
Documentation/powerpc: Fix ptrace request names
Christophe Leroy (35):
powerpc/kuap: Avoid unnecessary reads of MD_AP
powerpc/kuap: Avoid useless jump_label on empty function
powerpc/kuap: Fold kuep_is_disabled() into its only user
powerpc/features: Add capability to update mmu features later
powerpc/kuap: MMU_FTR_BOOK3S_KUAP becomes MMU_FTR_KUAP
powerpc/kuap: Use MMU_FTR_KUAP on all and refactor disabling kuap
powerpc/kuap: Simplify KUAP lock/unlock on BOOK3S/32
powerpc/kuap: KUAP enabling/disabling functions must be __always_inline
powerpc/kuap: Use ASM feature fixups instead of static branches
powerpc/radix: Move some functions into #ifdef
CONFIG_KVM_BOOK3S_HV_POSSIBLE
powerpc/include: Remove unneeded #include
powerpc/include: Declare mpc8xx_immr in 8xx_immap.h
powerpc/include: Remove mpc8260.h and m82xx_pci.h
