Hi Dominik, On Thu, 15 Mar 2018 07:00:05 +0100 Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx> wrote: > > On Thu, Mar 15, 2018 at 09:44:30AM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > > > arch/cris/kernel/sys_cris.c > > On Thu, Mar 15, 2018 at 09:46:17AM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > > > arch/frv/kernel/sys_frv.c > > On Thu, Mar 15, 2018 at 09:48:10AM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > > > arch/mn10300/kernel/sys_mn10300.c > > On Thu, Mar 15, 2018 at 09:49:40AM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got a conflict in: > > > > arch/score/kernel/sys_score.c > > On Thu, Mar 15, 2018 at 09:52:35AM +1100, Stephen Rothwell wrote: > > Today's linux-next merge of the asm-generic tree got conflicts in: > > > > arch/tile/kernel/compat.c > > arch/tile/kernel/sys.c > > to follow up on this, I have dropped the changes to these architectures; > that code will continue to build and work (for the time being, at least) > with or without the patches causing the conflicts noted above. OK, thanks. -- Cheers, Stephen Rothwell
Attachment:
pgpO9xSe4nil3.pgp
Description: OpenPGP digital signature
