Re: linux-next: manual merge of the tip tree with the dma-mapping tree

Hi all, On Tue, 6 Oct 2020 17:11:35 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/kernel/setup.c > > between commit: > > f47e22d65d08 ("dma-mapping: split ") > > from the dma-mapping tree and commit: > > a945c8345ec0

linux-next: manual merge of the tip tree with the dma-mapping tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/kernel/setup.c between commit: f47e22d65d08 ("dma-mapping: split ") from the dma-mapping tree and commit: a945c8345ec0 ("static_call: Allow early init") from the tip tree. I fixed it up (see below) and can