* linux-next: manual merge of the generic-ioremap tree with the drm-misc tree
@ 2020-01-16 5:02 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-01-16 5:02 UTC (permalink / raw)
To: Christoph Hellwig, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Julia Lawall,
Bartlomiej Zolnierkiewicz
[-- Attachment #1: Type: text/plain, Size: 1931 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/video/fbdev/s1d13xxxfb.c
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.
--
Cheers,
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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the generic-ioremap tree with the drm-misc tree
@ 2020-01-16 5:02 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-01-16 5:02 UTC (permalink / raw)
To: Christoph Hellwig, Daniel Vetter, Intel Graphics, DRI
Cc: Julia Lawall, Linux Next Mailing List, Linux Kernel Mailing List,
Bartlomiej Zolnierkiewicz
[-- Attachment #1.1: Type: text/plain, Size: 1931 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/video/fbdev/s1d13xxxfb.c
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.
--
Cheers,
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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] linux-next: manual merge of the generic-ioremap tree with the drm-misc tree
@ 2020-01-16 5:02 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2020-01-16 5:02 UTC (permalink / raw)
To: Christoph Hellwig, Daniel Vetter, Intel Graphics, DRI
Cc: Julia Lawall, Linux Next Mailing List, Linux Kernel Mailing List,
Bartlomiej Zolnierkiewicz
[-- Attachment #1.1: Type: text/plain, Size: 1931 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/video/fbdev/s1d13xxxfb.c
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.
--
Cheers,
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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-16 5:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-16 5:02 linux-next: manual merge of the generic-ioremap tree with the drm-misc tree Stephen Rothwell
2020-01-16 5:02 ` [Intel-gfx] " Stephen Rothwell
2020-01-16 5:02 ` Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.