Message ID | 87a6wmzwco.fsf@mpe.ellerman.id.au (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | [GIT,PULL] Please pull powerpc/linux.git powerpc-5.10-1 tag | expand |
On Thu, Oct 15, 2020 at 8:24 PM Michael Ellerman <mpe@ellerman.id.au> wrote: > > Just two minor conflicts I'm aware of. The only slight subtlety is the conflict > in kasan_init() where "int ret" needs to move out of the for_each_mem_range() > and up to the function scope. Well, there was also a conflict for the dependencies of OCXL. I resolved that by ruthlessly simplifying the dependency: - depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV - depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE ++ depends on HOTPLUG_PCI_POWERNV because all the other dependencies seem to be pointless. HOTPLUG_PCI_POWERNV already has a depends on PPC_POWERNV && EEH so there's no point in repeating those. And PPC_XIVE_NATIVE is selected by PPC_POWERNV, so if PPC_POWERNV, we know PPC_XIVE_NATIVE is set. Maybe I missed something strange, so I'm just letting you know so you can blame me if I broke something. Linus
The pull request you sent on Fri, 16 Oct 2020 14:24:39 +1100:
> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-5.10-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/96685f8666714233d34abb71b242448c80077536
Thank you!
Linus Torvalds <torvalds@linux-foundation.org> writes: > On Thu, Oct 15, 2020 at 8:24 PM Michael Ellerman <mpe@ellerman.id.au> wrote: >> >> Just two minor conflicts I'm aware of. The only slight subtlety is the conflict >> in kasan_init() where "int ret" needs to move out of the for_each_mem_range() >> and up to the function scope. > > Well, there was also a conflict for the dependencies of OCXL. Yep, it was so trivial I didn't think it was worth calling out. > I resolved that by ruthlessly simplifying the dependency: > > - depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV > - depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE > ++ depends on HOTPLUG_PCI_POWERNV > > because all the other dependencies seem to be pointless. > > HOTPLUG_PCI_POWERNV already has a > > depends on PPC_POWERNV && EEH > > so there's no point in repeating those. And PPC_POWERNV selects FORCE_PCI, which takes care of the dependency on PCI. > And PPC_XIVE_NATIVE is selected by PPC_POWERNV, so if PPC_POWERNV, we > know PPC_XIVE_NATIVE is set. > > Maybe I missed something strange, so I'm just letting you know so you > can blame me if I broke something. No, that looks good to me. Thanks. cheers