Linux-Next Archive on
 help / color / Atom feed
From: Stephen Rothwell <>
To: Christoph Hellwig <>,
	Daniel Vetter <>,
	Intel Graphics <>,
	DRI <>
Cc: Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Julia Lawall <>,
	Bartlomiej Zolnierkiewicz <>
Subject: linux-next: manual merge of the generic-ioremap tree with the drm-misc tree
Date: Thu, 16 Jan 2020 16:02:38 +1100
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1931 bytes --]

Hi all,

Today's linux-next merge of the generic-ioremap tree got a conflict in:


between commit:

  091be7245a03 ("fbdev: s1d13xxxfb: use resource_size")

from the drm-misc tree and commit:

  4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")

from the generic-ioremap 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.

Stephen Rothwell

diff --cc drivers/video/fbdev/s1d13xxxfb.c
index c23defa27036,8048499e398d..000000000000
--- a/drivers/video/fbdev/s1d13xxxfb.c
+++ b/drivers/video/fbdev/s1d13xxxfb.c
@@@ -809,8 -809,8 +809,8 @@@ static int s1d13xxxfb_probe(struct plat
  	platform_set_drvdata(pdev, info);
  	default_par = info->par;
- 	default_par->regs = ioremap_nocache(pdev->resource[1].start,
- 					    resource_size(&pdev->resource[1]));
+ 	default_par->regs = ioremap(pdev->resource[1].start,
 -			pdev->resource[1].end - pdev->resource[1].start +1);
++				    resource_size(&pdev->resource[1]));
  	if (!default_par->regs) {
  		printk(KERN_ERR PFX "unable to map registers\n");
  		ret = -ENOMEM;
@@@ -818,8 -818,9 +818,8 @@@
  	info->pseudo_palette = default_par->pseudo_palette;
- 	info->screen_base = ioremap_nocache(pdev->resource[0].start,
- 					    resource_size(&pdev->resource[0]));
+ 	info->screen_base = ioremap(pdev->resource[0].start,
 -			pdev->resource[0].end - pdev->resource[0].start +1);
++				    resource_size(&pdev->resource[0]));
  	if (!info->screen_base) {
  		printk(KERN_ERR PFX "unable to map framebuffer\n");
  		ret = -ENOMEM;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply index

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone