[packages/kernel/LINUX_3_10] - 3.10.60 - removed patches applied upstream

[baggins]

commit ee656428166da1075fdda35324ed37c3ee60f7f0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 15 18:49:10 2014 +0100

    - 3.10.60
    - removed patches applied upstream

 kernel-fbcon-margins.patch | 29 -----------------------------
 kernel.spec                |  6 ++----
 2 files changed, 2 insertions(+), 33 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index cc7dfcd..f2428a9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
 
 %define		rel		1
 %define		basever		3.10
-%define		postver		.59
+%define		postver		.60
 
 %define		versuffix	-%{basever}
 
@@ -116,7 +116,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5:	4f25cd5bec5f8d5a7d935b3f2ccb8481
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:	e57dfc77e61949e2b1be42ec700e3fd1
+# Patch0-md5:	15c4a4ec732ce21c7696e3c3bf9cdf65
 %endif
 Source1:	kernel.sysconfig
 
@@ -146,7 +146,6 @@ 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
 Patch6:		linux-wistron-nx.patch
 
@@ -666,7 +665,6 @@ cd linux-%{basever}
 %if %{with fbcondecor}
 %patch3 -p1
 %endif
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 
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) {
================================================================

---- gitweb:

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