Warning with next-20210121 on s390

[Sven Schnelle]

there's a warning with linux-next on s390:

[   33.893818] systemd-xdg-autostart-generator[544]: Not generating service for XDG autostart app-at\x2dspi\x2ddbus\x2dbus-autostart.service, startup phases are not supported. 
[   54.613344] ------------[ cut here ]------------ 
[   54.613702] Late current task rescheduling may be lost 
[   54.613709] WARNING: CPU: 0 PID: 574 at linux/kernel/sched/core.c:628 sched_resched_local_assert_allowed+0x86/0x90 
[   54.613714] Modules linked in: 
[   54.613717] CPU: 0 PID: 574 Comm: qemu-system-s39 Not tainted 5.11.0-rc4-next-20210121 #2601 
[   54.613721] Hardware name: IBM 3906 M04 704 (z/VM 7.1.0) 
[   54.613724] Krnl PSW : 0404e00180000000 0000000000d86bea (sched_resched_local_assert_allowed+0x8a/0x90) 
[   54.613730]            R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3 

This is because of a non-obvious merge conflict between 56e62a737028
("s390: convert to generic entry") and 845f44e8ef28 ("sched: Report local
wake up on resched blind zone within idle loop"). Can you include the attached patch
into linux-next?

Thanks,
Sven