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

Commit Message

Stephen Rothwell Oct. 28, 2024, 2:34 a.m. UTC

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 it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Comments

Arnd Bergmann Oct. 28, 2024, 9:53 a.m. UTC | #1

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_request_region(&pdev->dev, ioaddr, iosize, "bochs-drm")) {
>   			DRM_ERROR("Cannot request ioports\n");
>   			return -EBUSY;

Looks good to me, thanks!

      Arnd

Patch

diff --cc drivers/gpu/drm/tiny/bochs.c
index e738bb858316,447989bb8201..000000000000
--- a/drivers/gpu/drm/tiny/bochs.c