[packages/kernel/LINUX_3_4] - 3.4.106 - fbcon-margins applied upstream

[baggins]

commit 4795e0665ef007a22ea2c554edc90636f54aedc1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 8 13:10:20 2015 +0100

    - 3.4.106
    - fbcon-margins applied upstream

 kernel-fbcon-margins.patch | 29 -----------------------------
 kernel-vserver-2.3.patch   |  2 +-
 kernel.spec                |  7 +++----
 3 files changed, 4 insertions(+), 34 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 98a8425..90f8bca 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,7 +93,7 @@
 
 %define		rel		1
 %define		basever		3.4
-%define		postver		.105
+%define		postver		.106
 
 %define		versuffix	-%{basever}
 
@@ -142,7 +142,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5:	967f72983655e2479f951195953e8480
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:	0f43fcca926776fd6fe849dcf62e633e
+# Patch0-md5:	fee956dfe6e1bb4bd0224ceb16338d9b
 %endif
 Source1:	kernel.sysconfig
 
@@ -175,7 +175,7 @@ Source58:	kernel-inittmpfs.config
 
 # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
 Patch3:		kernel-fbcondecor.patch
-Patch4:		kernel-fbcon-margins.patch
+
 Patch5:		linux-wistron-amilo8210.patch
 
 # netfilter related stuff mostly based on patch-o-matic-ng
@@ -685,7 +685,6 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 %if %{with fbcondecor}
 %patch3 -p1
 %endif
-%patch4 -p1
 %patch5 -p1
 
 ## netfilter
diff --git a/kernel-fbcon-margins.patch b/kernel-fbcon-margins.patch
deleted file mode 100644
index fd77379..0000000
--- a/kernel-fbcon-margins.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-This fixes "margin colour" (colour used to clear margins - e.g. a half of line
-at the bottom of 100x37 console on 800x600 framebuffer).
-
-I don't know what was the intention behind using attr_bgcol_ec() here, but it
-caused using of background colour of last erase character to clear margins -
-which definitely isn't what we want...
-This patch changes margin colour to black (or colour 0 in palette modes).
-
-	-- Jakub Bogusz <qboosh at pld-linux.org>
-
---- linux-2.6.9/drivers/video/console/bitblit.c.orig	2004-10-20 18:13:32.000000000 +0200
-+++ linux-2.6.9/drivers/video/console/bitblit.c	2004-10-20 18:22:35.153056112 +0200
-@@ -206,7 +206,6 @@
- static void bit_clear_margins(struct vc_data *vc, struct fb_info *info,
- 			      int bottom_only)
- {
--	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
- 	unsigned int cw = vc->vc_font.width;
- 	unsigned int ch = vc->vc_font.height;
- 	unsigned int rw = info->var.xres - (vc->vc_cols*cw);
-@@ -215,7 +214,7 @@
- 	unsigned int bs = info->var.yres - bh;
- 	struct fb_fillrect region;
- 
--	region.color = attr_bgcol_ec(bgshift, vc, info);
-+	region.color = 0;
- 	region.rop = ROP_COPY;
- 
- 	if (rw && !bottom_only) {
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 98d007d..d31cd75 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1421,9 +1421,9 @@ diff -NurpP --minimal linux-3.4.103/drivers/net/tun.c linux-3.4.103-vs2.3.3.9/dr
  #include <linux/virtio_net.h>
  #include <linux/rcupdate.h>
 +#include <linux/vs_network.h>
+ #include <net/ipv6.h>
  #include <net/net_namespace.h>
  #include <net/netns/generic.h>
- #include <net/rtnetlink.h>
 @@ -120,6 +121,7 @@ struct tun_struct {
  	unsigned int 		flags;
  	uid_t			owner;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/4795e0665ef007a22ea2c554edc90636f54aedc1