Hi Randy/Andreas. On Thu, Feb 22, 2024 at 09:15:28PM -0800, Randy Dunlap wrote: > Hi Andreas, > > Please pick up this patch from June/2023. I have already replied to > the patch with: > > Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> > Tested-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> # build-tested > > and I just rechecked it on linux-next-20240223 to make sure that it > builds cleanly. It does; however, there is one trivial merge warning: > > patching file arch/sparc/include/asm/parport.h > Hunk #1 succeeded at 20 (offset 1 line). > Hunk #2 succeeded at 252 (offset 1 line). > > The patch: > https://lore.kernel.org/lkml/alpine.DEB.2.21.2306190121540.14084@xxxxxxxxxxxxxxxxx/ I took a quick look at the patch. It does the minimal to fix the build but the ebus_dma thing is only used by sparc64 an should not be visible at all for sparc32. I think the right fix is to make the current arch/sparc/include/asm/parport.h sparc64 specific and use asm-generic/parport.h for sparc32. Sam
