linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the tip tree with the omap_dss2 tree
@ 2014-03-04  5:13 Stephen Rothwell
  2014-04-02 22:33 ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2014-03-04  5:13 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Tomi Valkeinen
  Cc: linux-next, linux-kernel

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

Hi all,

Today's linux-next merge of the tip tree got conflicts in
drivers/video/Kconfig, drivers/video/Makefile and drivers/video/sgivwfb.c
between commit 08667731d1d4 ("video: move fbdev to drivers/video/fbdev")
from the omap_dss2 tree and commit c5f9ee3d665a ("x86, platforms: Remove
SGI Visual Workstation") from the tip tree.

I removed drivers/video/fbdev/sgivwfb.c and added the following merge
fix patch and can carry the fix as necessary (no action is required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Mar 2014 16:11:12 +1100
Subject: [PATCH] video: fbdev: fix up fro removal of SGI Visual Workstation

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/video/fbdev/Kconfig  | 11 +----------
 drivers/video/fbdev/Makefile |  1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 31c3f3ddfd38..6b1984c7f4e7 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -765,18 +765,9 @@ config FB_HGA
 	  As this card technology is at least 25 years old,
 	  most people will answer N here.
 
-config FB_SGIVW
-	tristate "SGI Visual Workstation framebuffer support"
-	depends on FB && X86_VISWS
-	select FB_CFB_FILLRECT
-	select FB_CFB_COPYAREA
-	select FB_CFB_IMAGEBLIT
-	help
-	  SGI Visual Workstation support for framebuffer graphics.
-
 config FB_GBE
 	bool "SGI Graphics Backend frame buffer support"
-	depends on (FB = y) && (SGI_IP32 || X86_VISWS)
+	depends on (FB = y) && SGI_IP32
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
index 6ef2c66110e3..0284f2a12538 100644
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_FB_CG14)             += cg14.o sbuslib.o
 obj-$(CONFIG_FB_P9100)            += p9100.o sbuslib.o
 obj-$(CONFIG_FB_TCX)              += tcx.o sbuslib.o
 obj-$(CONFIG_FB_LEO)              += leo.o sbuslib.o
-obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o
 obj-$(CONFIG_FB_ACORN)            += acornfb.o
 obj-$(CONFIG_FB_ATARI)            += atafb.o c2p_iplan2.o atafb_mfb.o \
                                      atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the tip tree with the omap_dss2 tree
  2014-03-04  5:13 linux-next: manual merge of the tip tree with the omap_dss2 tree Stephen Rothwell
@ 2014-04-02 22:33 ` Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2014-04-02 22:33 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Tomi Valkeinen, Linus
  Cc: linux-next, linux-kernel

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

H all,

On Tue, 4 Mar 2014 16:13:20 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got conflicts in
> drivers/video/Kconfig, drivers/video/Makefile and drivers/video/sgivwfb.c
> between commit 08667731d1d4 ("video: move fbdev to drivers/video/fbdev")
> from the omap_dss2 tree and commit c5f9ee3d665a ("x86, platforms: Remove
> SGI Visual Workstation") from the tip tree.
> 
> I removed drivers/video/fbdev/sgivwfb.c and added the following merge
> fix patch and can carry the fix as necessary (no action is required).

This resolution is now needed when the omap_dss2 tree is merged with
Linus' tree.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 4 Mar 2014 16:11:12 +1100
> Subject: [PATCH] video: fbdev: fix up fro removal of SGI Visual Workstation
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/video/fbdev/Kconfig  | 11 +----------
>  drivers/video/fbdev/Makefile |  1 -
>  2 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
> index 31c3f3ddfd38..6b1984c7f4e7 100644
> --- a/drivers/video/fbdev/Kconfig
> +++ b/drivers/video/fbdev/Kconfig
> @@ -765,18 +765,9 @@ config FB_HGA
>  	  As this card technology is at least 25 years old,
>  	  most people will answer N here.
>  
> -config FB_SGIVW
> -	tristate "SGI Visual Workstation framebuffer support"
> -	depends on FB && X86_VISWS
> -	select FB_CFB_FILLRECT
> -	select FB_CFB_COPYAREA
> -	select FB_CFB_IMAGEBLIT
> -	help
> -	  SGI Visual Workstation support for framebuffer graphics.
> -
>  config FB_GBE
>  	bool "SGI Graphics Backend frame buffer support"
> -	depends on (FB = y) && (SGI_IP32 || X86_VISWS)
> +	depends on (FB = y) && SGI_IP32
>  	select FB_CFB_FILLRECT
>  	select FB_CFB_COPYAREA
>  	select FB_CFB_IMAGEBLIT
> diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
> index 6ef2c66110e3..0284f2a12538 100644
> --- a/drivers/video/fbdev/Makefile
> +++ b/drivers/video/fbdev/Makefile
> @@ -55,7 +55,6 @@ obj-$(CONFIG_FB_CG14)             += cg14.o sbuslib.o
>  obj-$(CONFIG_FB_P9100)            += p9100.o sbuslib.o
>  obj-$(CONFIG_FB_TCX)              += tcx.o sbuslib.o
>  obj-$(CONFIG_FB_LEO)              += leo.o sbuslib.o
> -obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o
>  obj-$(CONFIG_FB_ACORN)            += acornfb.o
>  obj-$(CONFIG_FB_ATARI)            += atafb.o c2p_iplan2.o atafb_mfb.o \
>                                       atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the tip tree with the omap_dss2 tree
  2013-08-14  4:31 Stephen Rothwell
@ 2013-08-14 11:53 ` David Herrmann
  0 siblings, 0 replies; 4+ messages in thread
From: David Herrmann @ 2013-08-14 11:53 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	linux-next, linux-kernel, Alexandre Courbot, Tomi Valkeinen

Hi

On Wed, Aug 14, 2013 at 6:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> drivers/video/simplefb.c between commit dbb5ff4c2300 ("simplefb: add
> support for a8b8g8r8 pixel format") from the omap_dss2 tree and commit
> 5ef76da644bf ("fbdev: simplefb: add init through platform_data") from the
> tip tree.
>
> I fixed it up (I think - see below, please check - I used the latter
> version of the above file) and can carry the fix as necessary (no action
> is required).

Looks good. Thanks!
David

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --git a/include/linux/platform_data/simplefb.h b/include/linux/platform_data/simplefb.h
> index 53774b0..c395d4c 100644
> --- a/include/linux/platform_data/simplefb.h
> +++ b/include/linux/platform_data/simplefb.h
> @@ -27,6 +27,7 @@
>         { "a8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {24, 8}, DRM_FORMAT_ARGB8888 }, \
>         { "x2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {0, 0}, DRM_FORMAT_XRGB2101010 }, \
>         { "a2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {30, 2}, DRM_FORMAT_ARGB2101010 }, \
> +       { "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }, \
>  }
>
>  /*

^ permalink raw reply	[flat|nested] 4+ messages in thread

* linux-next: manual merge of the tip tree with the omap_dss2 tree
@ 2013-08-14  4:31 Stephen Rothwell
  2013-08-14 11:53 ` David Herrmann
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2013-08-14  4:31 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
  Cc: linux-next, linux-kernel, Alexandre Courbot, Tomi Valkeinen,
	David Herrmann

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/video/simplefb.c between commit dbb5ff4c2300 ("simplefb: add
support for a8b8g8r8 pixel format") from the omap_dss2 tree and commit
5ef76da644bf ("fbdev: simplefb: add init through platform_data") from the
tip tree.

I fixed it up (I think - see below, please check - I used the latter
version of the above file) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --git a/include/linux/platform_data/simplefb.h b/include/linux/platform_data/simplefb.h
index 53774b0..c395d4c 100644
--- a/include/linux/platform_data/simplefb.h
+++ b/include/linux/platform_data/simplefb.h
@@ -27,6 +27,7 @@
 	{ "a8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {24, 8}, DRM_FORMAT_ARGB8888 }, \
 	{ "x2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {0, 0}, DRM_FORMAT_XRGB2101010 }, \
 	{ "a2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {30, 2}, DRM_FORMAT_ARGB2101010 }, \
+	{ "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }, \
 }
 
 /*

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-04-02 22:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-04  5:13 linux-next: manual merge of the tip tree with the omap_dss2 tree Stephen Rothwell
2014-04-02 22:33 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2013-08-14  4:31 Stephen Rothwell
2013-08-14 11:53 ` David Herrmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).