On 7/16/20 10:23 AM, Pierre Morel wrote: > Provide some definitions and library routines that can be used by > tests targeting the channel subsystem. > > Signed-off-by: Pierre Morel > Acked-by: Thomas Huth > Reviewed-by: Cornelia Huck > Acked-by: Janosch Frank > --- [...] > diff --git a/s390x/Makefile b/s390x/Makefile > index ddb4b48..050c40b 100644 > --- a/s390x/Makefile > +++ b/s390x/Makefile > @@ -51,6 +51,7 @@ cflatobjs += lib/s390x/sclp-console.o > cflatobjs += lib/s390x/interrupt.o > cflatobjs += lib/s390x/mmu.o > cflatobjs += lib/s390x/smp.o > +cflatobjs += lib/s390x/css_dump.o > > OBJDIRS += lib/s390x > I need to fix this up when picking because Thomas added vm.o after smp.o. Can I do that or do you want to rebase on my next branch?