Merge our fixes branch into next. That lets us resolve a conflict in arch/powerpc/sysdev/xive/common.c. Between |
||
---|---|---|
.. | ||
common.c | ||
Kconfig | ||
Makefile | ||
native.c | ||
spapr.c | ||
xive-internal.h |
Merge our fixes branch into next. That lets us resolve a conflict in arch/powerpc/sysdev/xive/common.c. Between |
||
---|---|---|
.. | ||
common.c | ||
Kconfig | ||
Makefile | ||
native.c | ||
spapr.c | ||
xive-internal.h |