Merge branch 'fixes' into next
We ended up with an ugly conflict between fixes and next in ftrace.h involving multiple nested ifdefs, and the automatic resolution is wrong. So merge fixes into next so we can fix it up.
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-class-cxl 8 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-cxl
- arch/powerpc/include/asm/ftrace.h 24 additions, 9 deletionsarch/powerpc/include/asm/ftrace.h
- arch/powerpc/include/asm/paca.h 0 additions, 1 deletionarch/powerpc/include/asm/paca.h
- arch/powerpc/include/asm/topology.h 5 additions, 8 deletionsarch/powerpc/include/asm/topology.h
- arch/powerpc/kernel/cpu_setup_power.S 6 additions, 0 deletionsarch/powerpc/kernel/cpu_setup_power.S
- arch/powerpc/kernel/dt_cpu_ftrs.c 1 addition, 0 deletionsarch/powerpc/kernel/dt_cpu_ftrs.c
- arch/powerpc/platforms/powernv/opal-nvram.c 12 additions, 2 deletionsarch/powerpc/platforms/powernv/opal-nvram.c
- drivers/misc/cxl/cxl.h 1 addition, 0 deletionsdrivers/misc/cxl/cxl.h
- drivers/misc/cxl/pci.c 12 additions, 0 deletionsdrivers/misc/cxl/pci.c
- drivers/misc/cxl/sysfs.c 10 additions, 0 deletionsdrivers/misc/cxl/sysfs.c
Loading
Please register or sign in to comment