Re: linux-next: manual merge of the drm tree with the asm-generic tree

2024-10-28 Thread Arnd Bergmann
On Mon, Oct 28, 2024, at 02:34, Stephen Rothwell wrote: > -} else { > +} else if (IS_ENABLED(CONFIG_HAS_IOPORT)) { > ioaddr = VBE_DISPI_IOPORT_INDEX; > iosize = 2; > - if (!request_region(ioaddr, iosize, "bochs-drm")) { > + if (!devm_re

linux-next: manual merge of the drm tree with the asm-generic tree

2024-10-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/qxl/Kconfig between commit: 65f5bf96750f ("drm: handle HAS_IOPORT dependencies") from the asm-generic tree and commit: 92c13542e878 ("drm/qxl: Run DRM default client setup") from the drm tree. I fixed

linux-next: manual merge of the drm tree with the asm-generic tree

2024-10-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/tiny/bochs.c between commit: 65f5bf96750f ("drm: handle HAS_IOPORT dependencies") from the asm-generic tree and commit: 7934a1c25097 ("drm/bochs: Use video aperture helpers") from the drm tree. I fixed

linux-next: manual merge of the drm tree with the asm-generic tree

2024-10-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/gma500/Kconfig between commit: 65f5bf96750f ("drm: handle HAS_IOPORT dependencies") from the asm-generic tree and commit: aecdbfe459a0 ("drm/gma500: Run DRM default client setup") from the drm tree. I