summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2018-08-25 20:04:39 +0200
committerBertrand Jacquin <bertrand@jacquin.bzh>2018-08-25 20:05:46 +0200
commit08c944a026486a9eb926772ec670eb52c6b1e217 (patch)
treea43b164b1ef26e77215ec86c6771e24c7ac4d246
parentdev-lang/php: Add patch for Oniguruma-6.8 (diff)
downloadetc-portage-patches-08c944a026486a9eb926772ec670eb52c6b1e217.tar.gz
sys-kernel/longterm-sources: Update from v4.4.150 to v4.4.152
-rw-r--r--sys-kernel/boest-v4.4.152/0001-patch-4.4-ja1.diff.patch (renamed from sys-kernel/boest-v4.4.150/0001-patch-4.4-ja1.diff.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0002-pool-2.6.25-tcp-timewait-20s.diff.patch (renamed from sys-kernel/boest-v4.4.150/0002-pool-2.6.25-tcp-timewait-20s.diff.patch)4
-rw-r--r--sys-kernel/boest-v4.4.152/0003-pool-2.6.25-disable-tcp-debug.diff.patch (renamed from sys-kernel/boest-v4.4.150/0003-pool-2.6.25-disable-tcp-debug.diff.patch)4
-rw-r--r--sys-kernel/boest-v4.4.152/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch (renamed from sys-kernel/boest-v4.4.150/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch)4
-rw-r--r--sys-kernel/boest-v4.4.152/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch (renamed from sys-kernel/boest-v4.4.150/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0006-pool-2.6.27-blink-ata-leds.diff.patch (renamed from sys-kernel/boest-v4.4.150/0006-pool-2.6.27-blink-ata-leds.diff.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0007-x86-pci-add-support-for-pci-rev-net.patch (renamed from sys-kernel/boest-v4.4.150/0007-x86-pci-add-support-for-pci-rev-net.patch)4
-rw-r--r--sys-kernel/boest-v4.4.152/0008-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch (renamed from sys-kernel/boest-v4.4.150/0008-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0009-This-patch-adds-support-for-a-restricted-user-contro.patch (renamed from sys-kernel/boest-v4.4.150/0009-This-patch-adds-support-for-a-restricted-user-contro.patch)4
-rw-r--r--sys-kernel/boest-v4.4.152/0010-fs-Enable-link-security-restrictions-by-default.patch (renamed from sys-kernel/boest-v4.4.150/0010-fs-Enable-link-security-restrictions-by-default.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0011-xfs-Make-xfsaild-freezeable-again.patch (renamed from sys-kernel/boest-v4.4.150/0011-xfs-Make-xfsaild-freezeable-again.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0012-4.4-2700_ThinkPad-30-brightness-control-fix.patch.patch (renamed from sys-kernel/boest-v4.4.150/0012-4.4-2700_ThinkPad-30-brightness-control-fix.patch.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0013-4.4-2900_dev-root-proc-mount-fix.patch.patch (renamed from sys-kernel/boest-v4.4.150/0013-4.4-2900_dev-root-proc-mount-fix.patch.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0014-4.4-4200_fbcondecor-3.19.patch.patch (renamed from sys-kernel/boest-v4.4.150/0014-4.4-4200_fbcondecor-3.19.patch.patch)118
-rw-r--r--sys-kernel/boest-v4.4.152/0015-4.4-4567_distro-Gentoo-Kconfig.patch.patch (renamed from sys-kernel/boest-v4.4.150/0015-4.4-4567_distro-Gentoo-Kconfig.patch.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0016-This-patch-has-been-tested-on-and-known-to-work-with.patch (renamed from sys-kernel/boest-v4.4.150/0016-This-patch-has-been-tested-on-and-known-to-work-with.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0017-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch (renamed from sys-kernel/boest-v4.4.150/0017-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0018-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch (renamed from sys-kernel/boest-v4.4.150/0018-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0019-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch (renamed from sys-kernel/boest-v4.4.150/0019-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch)2
-rw-r--r--sys-kernel/boest-v4.4.152/0020-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch (renamed from sys-kernel/boest-v4.4.150/0020-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch)2
l---------sys-kernel/longterm-sources-4.4.1501
l---------sys-kernel/longterm-sources-4.4.1521
22 files changed, 88 insertions, 80 deletions
diff --git a/sys-kernel/boest-v4.4.150/0001-patch-4.4-ja1.diff.patch b/sys-kernel/boest-v4.4.152/0001-patch-4.4-ja1.diff.patch
index e1670aa3..54be880c 100644
--- a/sys-kernel/boest-v4.4.150/0001-patch-4.4-ja1.diff.patch
+++ b/sys-kernel/boest-v4.4.152/0001-patch-4.4-ja1.diff.patch
@@ -1,4 +1,4 @@
-From 64e3a471f4d8209915e734dd3712c2f7ee6d5288 Mon Sep 17 00:00:00 2001
+From c99d20bb0e89a17731b838532edb532c4feae731 Mon Sep 17 00:00:00 2001
From: Julian Anastasov <ja@ssi.bg>
Date: Mon, 11 Jan 2016 22:05:26 +0000
Subject: [PATCH 01/20] patch-4.4-ja1.diff
diff --git a/sys-kernel/boest-v4.4.150/0002-pool-2.6.25-tcp-timewait-20s.diff.patch b/sys-kernel/boest-v4.4.152/0002-pool-2.6.25-tcp-timewait-20s.diff.patch
index e51ff45a..db3b8129 100644
--- a/sys-kernel/boest-v4.4.150/0002-pool-2.6.25-tcp-timewait-20s.diff.patch
+++ b/sys-kernel/boest-v4.4.152/0002-pool-2.6.25-tcp-timewait-20s.diff.patch
@@ -1,4 +1,4 @@
-From 42c2112a4e7096adc4a0f92d7e97b7d2cbf9ea83 Mon Sep 17 00:00:00 2001
+From b2774014cc2a22dad60b4b0487c75f732f9ee428 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Feb 2009 14:51:33 +0100
Subject: [PATCH 02/20] pool/2.6.25-tcp-timewait-20s.diff
@@ -11,7 +11,7 @@ Signed-off-by: Bertrand Jacquin <bertrand@jacquin.bzh>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
-index cac4a6ad5db3..8185987f5533 100644
+index 6c89238f192e..986b8332f58a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -114,8 +114,8 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);
diff --git a/sys-kernel/boest-v4.4.150/0003-pool-2.6.25-disable-tcp-debug.diff.patch b/sys-kernel/boest-v4.4.152/0003-pool-2.6.25-disable-tcp-debug.diff.patch
index a9a4d775..3a49d82e 100644
--- a/sys-kernel/boest-v4.4.150/0003-pool-2.6.25-disable-tcp-debug.diff.patch
+++ b/sys-kernel/boest-v4.4.152/0003-pool-2.6.25-disable-tcp-debug.diff.patch
@@ -1,4 +1,4 @@
-From 0594524bfe439aedfbf0519bf30c1f21e1f280ce Mon Sep 17 00:00:00 2001
+From 2452129105a1f8b26771035005fb8574d4134d23 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Feb 2009 14:51:33 +0100
Subject: [PATCH 03/20] pool/2.6.25-disable-tcp-debug.diff
@@ -11,7 +11,7 @@ Signed-off-by: Bertrand Jacquin <bertrand@jacquin.bzh>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 8185987f5533..03839685a397 100644
+index 986b8332f58a..33e1b059c4ff 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -18,7 +18,7 @@
diff --git a/sys-kernel/boest-v4.4.150/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch b/sys-kernel/boest-v4.4.152/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch
index d33e3e2a..047b064e 100644
--- a/sys-kernel/boest-v4.4.150/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch
+++ b/sys-kernel/boest-v4.4.152/0004-TCP-add-a-sysctl-to-disable-simultaneous-connection-.patch
@@ -1,4 +1,4 @@
-From 5561d4d06721570296e1affd33da49da5ba388eb Mon Sep 17 00:00:00 2001
+From 8215fabda8d2b051f9869362a4bf9d1c5e984fb5 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Wed, 8 Oct 2008 10:00:42 +0200
Subject: [PATCH 04/20] TCP: add a sysctl to disable simultaneous connection
@@ -72,7 +72,7 @@ index 8539b8adb9da..3c1fa359ef54 100644
Limit of socket listen() backlog, known in userspace as SOMAXCONN.
Defaults to 128. See also tcp_max_syn_backlog for additional tuning
diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 03839685a397..c9602f8f30c3 100644
+index 33e1b059c4ff..323032b9da27 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -272,6 +272,7 @@ extern int sysctl_tcp_moderate_rcvbuf;
diff --git a/sys-kernel/boest-v4.4.150/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch b/sys-kernel/boest-v4.4.152/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch
index bbf7cae7..961cf924 100644
--- a/sys-kernel/boest-v4.4.150/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch
+++ b/sys-kernel/boest-v4.4.152/0005-pool-2.6.25-disable-kbdrate-at-boot.diff.patch
@@ -1,4 +1,4 @@
-From cd7220b42f18f3e7bdaf25ddc739e11dd2941996 Mon Sep 17 00:00:00 2001
+From 83c2d27215c2feed70b33c572fcfbeca2a6f4a4d Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Feb 2009 14:51:33 +0100
Subject: [PATCH 05/20] pool/2.6.25-disable-kbdrate-at-boot.diff
diff --git a/sys-kernel/boest-v4.4.150/0006-pool-2.6.27-blink-ata-leds.diff.patch b/sys-kernel/boest-v4.4.152/0006-pool-2.6.27-blink-ata-leds.diff.patch
index 340c167c..9bab818f 100644
--- a/sys-kernel/boest-v4.4.150/0006-pool-2.6.27-blink-ata-leds.diff.patch
+++ b/sys-kernel/boest-v4.4.152/0006-pool-2.6.27-blink-ata-leds.diff.patch
@@ -1,4 +1,4 @@
-From 2ffcf01361f0bb9495d78d5674ea943ef22b73e1 Mon Sep 17 00:00:00 2001
+From 25edd0081992da021860850daf750b62a2912823 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sun, 15 Feb 2009 14:51:33 +0100
Subject: [PATCH 06/20] pool/2.6.27-blink-ata-leds.diff
diff --git a/sys-kernel/boest-v4.4.150/0007-x86-pci-add-support-for-pci-rev-net.patch b/sys-kernel/boest-v4.4.152/0007-x86-pci-add-support-for-pci-rev-net.patch
index ff12eb4f..5fd513d1 100644
--- a/sys-kernel/boest-v4.4.150/0007-x86-pci-add-support-for-pci-rev-net.patch
+++ b/sys-kernel/boest-v4.4.152/0007-x86-pci-add-support-for-pci-rev-net.patch
@@ -1,4 +1,4 @@
-From fabfd39725456f7f8c609bbf797105c520334eda Mon Sep 17 00:00:00 2001
+From 0efc7088a92d3292e38defc139ddd2d8828f4c7e Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Wed, 2 Feb 2011 12:40:44 +0100
Subject: [PATCH 07/20] x86/pci: add support for pci=rev-net
@@ -49,7 +49,7 @@ index 8fd6f44aee83..f804a6c6fd8d 100644
pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
return NULL;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 566897f24dee..54e724d5f134 100644
+index 5f040619393f..ca5decaa9a46 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -84,6 +84,8 @@ int no_pci_devices(void)
diff --git a/sys-kernel/boest-v4.4.150/0008-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch b/sys-kernel/boest-v4.4.152/0008-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch
index f9991b32..4a453480 100644
--- a/sys-kernel/boest-v4.4.150/0008-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch
+++ b/sys-kernel/boest-v4.4.152/0008-Disable-CONFIG_PROCESSOR_SELECT-printk-s.patch
@@ -1,4 +1,4 @@
-From c350cfab9829ba07625b09911fde2feeae6a5185 Mon Sep 17 00:00:00 2001
+From 67f3949e6aa95ee74338638789a94de784bcfa90 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Wed, 9 Jan 2013 00:28:28 +0100
Subject: [PATCH 08/20] Disable CONFIG_PROCESSOR_SELECT printk()'s
diff --git a/sys-kernel/boest-v4.4.150/0009-This-patch-adds-support-for-a-restricted-user-contro.patch b/sys-kernel/boest-v4.4.152/0009-This-patch-adds-support-for-a-restricted-user-contro.patch
index 77398277..3c83c097 100644
--- a/sys-kernel/boest-v4.4.150/0009-This-patch-adds-support-for-a-restricted-user-contro.patch
+++ b/sys-kernel/boest-v4.4.152/0009-This-patch-adds-support-for-a-restricted-user-contro.patch
@@ -1,8 +1,8 @@
-From fa6fa50b918eb2204d404313961bb9c1e33de0af Mon Sep 17 00:00:00 2001
+From e9740124da6fc530e222df2ed3f27d60696190e2 Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Sun, 10 Jan 2016 12:18:55 -0500
Subject: [PATCH 09/20] This patch adds support for a restricted
- user-controlled namespace on tmpfs filesystem used to house PaX flags. The
+ user-controlled namespace on tmpfs filesystem used to house PaX flags. The
namespace must be of the form user.pax.* and its value cannot exceed a size
of 8 bytes.
diff --git a/sys-kernel/boest-v4.4.150/0010-fs-Enable-link-security-restrictions-by-default.patch b/sys-kernel/boest-v4.4.152/0010-fs-Enable-link-security-restrictions-by-default.patch
index 03401d86..406df5ab 100644
--- a/sys-kernel/boest-v4.4.150/0010-fs-Enable-link-security-restrictions-by-default.patch
+++ b/sys-kernel/boest-v4.4.152/0010-fs-Enable-link-security-restrictions-by-default.patch
@@ -1,4 +1,4 @@
-From ac9d8b7e095adf78b2020212405fbc64dae04716 Mon Sep 17 00:00:00 2001
+From 107d7027fdd64b66dd92ac270ca91d331f7c1cd6 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 2 Nov 2012 05:32:06 +0000
Subject: [PATCH 10/20] fs: Enable link security restrictions by default
diff --git a/sys-kernel/boest-v4.4.150/0011-xfs-Make-xfsaild-freezeable-again.patch b/sys-kernel/boest-v4.4.152/0011-xfs-Make-xfsaild-freezeable-again.patch
index b0bfc837..16ab1804 100644
--- a/sys-kernel/boest-v4.4.150/0011-xfs-Make-xfsaild-freezeable-again.patch
+++ b/sys-kernel/boest-v4.4.152/0011-xfs-Make-xfsaild-freezeable-again.patch
@@ -1,4 +1,4 @@
-From 3a095cf5c2e4aa77a3728bb36a8d91b7f1532a64 Mon Sep 17 00:00:00 2001
+From 7e5ac4b07a5b1fbb41a257d953c1dfb743da974a Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko@suse.com>
Date: Mon, 8 Feb 2016 14:59:07 +1100
Subject: [PATCH 11/20] xfs: Make xfsaild freezeable again
diff --git a/sys-kernel/boest-v4.4.150/0012-4.4-2700_ThinkPad-30-brightness-control-fix.patch.patch b/sys-kernel/boest-v4.4.152/0012-4.4-2700_ThinkPad-30-brightness-control-fix.patch.patch
index 670c635b..ad61803a 100644
--- a/sys-kernel/boest-v4.4.150/0012-4.4-2700_ThinkPad-30-brightness-control-fix.patch.patch
+++ b/sys-kernel/boest-v4.4.152/0012-4.4-2700_ThinkPad-30-brightness-control-fix.patch.patch
@@ -1,4 +1,4 @@
-From b9e160ad485c107ce376763e63d2765a8f54de35 Mon Sep 17 00:00:00 2001
+From 365a493c2a8f4a89a6d4c539e96ac12a3bf53b46 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Sun, 10 Jan 2016 12:18:55 -0500
Subject: [PATCH 12/20] 4.4:2700_ThinkPad-30-brightness-control-fix.patch
diff --git a/sys-kernel/boest-v4.4.150/0013-4.4-2900_dev-root-proc-mount-fix.patch.patch b/sys-kernel/boest-v4.4.152/0013-4.4-2900_dev-root-proc-mount-fix.patch.patch
index ada3ac79..892db49a 100644
--- a/sys-kernel/boest-v4.4.150/0013-4.4-2900_dev-root-proc-mount-fix.patch.patch
+++ b/sys-kernel/boest-v4.4.152/0013-4.4-2900_dev-root-proc-mount-fix.patch.patch
@@ -1,4 +1,4 @@
-From 0853c34fda77ae25934fd64e2df5bb403a2e2226 Mon Sep 17 00:00:00 2001
+From 53291ebb5c39ff0ef998de41005a47d75672b783 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Sun, 10 Jan 2016 12:18:55 -0500
Subject: [PATCH 13/20] 4.4:2900_dev-root-proc-mount-fix.patch
diff --git a/sys-kernel/boest-v4.4.150/0014-4.4-4200_fbcondecor-3.19.patch.patch b/sys-kernel/boest-v4.4.152/0014-4.4-4200_fbcondecor-3.19.patch.patch
index bbf0fdfb..21d51146 100644
--- a/sys-kernel/boest-v4.4.150/0014-4.4-4200_fbcondecor-3.19.patch.patch
+++ b/sys-kernel/boest-v4.4.152/0014-4.4-4200_fbcondecor-3.19.patch.patch
@@ -1,28 +1,28 @@
-From e0db35624d6e55cc17dd044cbf6570a4cb948c97 Mon Sep 17 00:00:00 2001
+From 3855155eed31d3d90cf77919b11a36a46ada9ae8 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Sun, 10 Jan 2016 12:18:55 -0500
Subject: [PATCH 14/20] 4.4:4200_fbcondecor-3.19.patch
---
Documentation/fb/00-INDEX | 2 +
- Documentation/fb/fbcondecor.txt | 206 +++++++++++++
+ Documentation/fb/fbcondecor.txt | 207 ++++++++++++++
drivers/Makefile | 9 +-
drivers/video/console/Kconfig | 13 +
drivers/video/console/Makefile | 1 +
drivers/video/console/bitblit.c | 20 +-
- drivers/video/console/cfbcondecor.c | 470 ++++++++++++++++++++++++++++++
+ drivers/video/console/cfbcondecor.c | 471 ++++++++++++++++++++++++++++++
drivers/video/console/fbcon.c | 176 ++++++++++--
drivers/video/console/fbcondecor.c | 555 ++++++++++++++++++++++++++++++++++++
drivers/video/console/fbcondecor.h | 78 +++++
drivers/video/fbdev/Kconfig | 1 -
- drivers/video/fbdev/core/fbcmap.c | 9 +-
+ drivers/video/fbdev/core/fbcmap.c | 11 +-
drivers/video/fbdev/core/fbmem.c | 9 -
include/linux/console_decor.h | 46 +++
include/linux/console_struct.h | 3 +
include/linux/fb.h | 31 ++
include/uapi/linux/fb.h | 61 ++++
kernel/sysctl.c | 13 +
- 18 files changed, 1658 insertions(+), 45 deletions(-)
+ 18 files changed, 1661 insertions(+), 46 deletions(-)
diff --git a/Documentation/fb/00-INDEX b/Documentation/fb/00-INDEX
index fe85e7c5907a..22309308ba56 100644
@@ -39,14 +39,14 @@ index fe85e7c5907a..22309308ba56 100644
gxfb.txt
diff --git a/Documentation/fb/fbcondecor.txt b/Documentation/fb/fbcondecor.txt
new file mode 100644
-index 000000000000..f074bba42eaf
+index 000000000000..3388c61aabba
--- /dev/null
+++ b/Documentation/fb/fbcondecor.txt
-@@ -0,0 +1,206 @@
+@@ -0,0 +1,207 @@
+What is it?
+-----------
+
-+The framebuffer decorations are a kernel feature which allows displaying a
++The framebuffer decorations are a kernel feature which allows displaying a
+background picture on selected consoles.
+
+What do I need to get it to work?
@@ -94,7 +94,7 @@ index 000000000000..f074bba42eaf
+ * rendering console text, using an image as a background (instead of a
+ standard solid color fbcon uses),
+ * accepting commands from the user via ioctls on the fbcondecor device,
-+ * calling the userspace helper to set things up as soon as the fb subsystem
++ * calling the userspace helper to set things up as soon as the fb subsystem
+ is initialized.
+
+The userspace helper is responsible for everything else, including parsing
@@ -103,7 +103,7 @@ index 000000000000..f074bba42eaf
+
+The fbcondecor protocol specifies how communication is done in both ways:
+kernel->userspace and userspace->helper.
-+
++
+Kernel -> Userspace
+-------------------
+
@@ -125,9 +125,9 @@ index 000000000000..f074bba42eaf
+
+getpic
+------
-+ The kernel issues this command to request image data. It's up to the
-+ userspace helper to find a background image appropriate for the specified
-+ theme and the current resolution. The userspace helper should respond by
++ The kernel issues this command to request image data. It's up to the
++ userspace helper to find a background image appropriate for the specified
++ theme and the current resolution. The userspace helper should respond by
+ issuing the FBIOCONDECOR_SETPIC ioctl.
+
+init
@@ -178,13 +178,13 @@ index 000000000000..f074bba42eaf
+semaphore. Not surprisingly, FBCON_DECOR_IO_ORIG_USER instructs it to acquire
+the console sem.
+
-+The framebuffer console decoration provides the following ioctls (all defined in
++The framebuffer console decoration provides the following ioctls (all defined in
+linux/fb.h):
+
+FBIOCONDECOR_SETPIC
+description: loads a background picture for a virtual console
+argument: struct fbcon_decor_iowrapper*; data: struct fb_image*
-+notes:
++notes:
+If called for consoles other than the current foreground one, the picture data
+will be ignored.
+
@@ -224,16 +224,16 @@ index 000000000000..f074bba42eaf
+Definition of struct fbcon_decor_iowrapper can be found in linux/fb.h.
+The fields in this struct have the following meaning:
+
-+vc:
++vc:
+Virtual console number.
+
-+origin:
++origin:
+Specifies if the ioctl is performed as a response to a kernel request. The
+fbcondecor helper should set this field to FBCON_DECOR_IO_ORIG_KERNEL, userspace
+programs should set it to FBCON_DECOR_IO_ORIG_USER. This field is necessary to
+avoid console semaphore deadlocks.
+
-+data:
++data:
+Pointer to a data structure appropriate for the performed ioctl. Type of
+the data struct is specified in the ioctls description.
+
@@ -249,6 +249,7 @@ index 000000000000..f074bba42eaf
+
+Fbcondecor, fbcondecor protocol design, current implementation & docs by:
+ Michal Januszewski <michalj+fbcondecor@gmail.com>
++
diff --git a/drivers/Makefile b/drivers/Makefile
index f42a74ebc1be..86307cfee510 100644
--- a/drivers/Makefile
@@ -277,7 +278,7 @@ index f42a74ebc1be..86307cfee510 100644
obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
-index 38da6e299149..fe581522744c 100644
+index 38da6e299149..de82471704bb 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -130,6 +130,19 @@ config FRAMEBUFFER_CONSOLE_ROTATION
@@ -291,8 +292,8 @@ index 38da6e299149..fe581522744c 100644
+ ---help---
+ This option enables support for framebuffer console decorations which
+ makes it possible to display images in the background of the system
-+ consoles. Note that userspace utilities are necessary in order to take
-+ advantage of these features. Refer to Documentation/fb/fbcondecor.txt
++ consoles. Note that userspace utilities are necessary in order to take
++ advantage of these features. Refer to Documentation/fb/fbcondecor.txt
+ for more information.
+
+ If unsure, say N.
@@ -311,7 +312,7 @@ index 43bfa485db96..cc104b6f636a 100644
+obj-$(CONFIG_FB_CON_DECOR) += fbcondecor.o cfbcondecor.o
obj-$(CONFIG_FB_STI) += sticore.o
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
-index dbfe4eecf12e..14da307d0528 100644
+index dbfe4eecf12e..b7fa612507b7 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -18,6 +18,7 @@
@@ -327,11 +328,11 @@ index dbfe4eecf12e..14da307d0528 100644
area.width = width * vc->vc_font.width;
+ if (fbcon_decor_active(info, vc)) {
-+ area.sx += vc->vc_decor.tx;
-+ area.sy += vc->vc_decor.ty;
-+ area.dx += vc->vc_decor.tx;
-+ area.dy += vc->vc_decor.ty;
-+ }
++ area.sx += vc->vc_decor.tx;
++ area.sy += vc->vc_decor.ty;
++ area.dx += vc->vc_decor.tx;
++ area.dy += vc->vc_decor.ty;
++ }
+
info->fbops->fb_copyarea(info, &area);
}
@@ -358,10 +359,10 @@ index dbfe4eecf12e..14da307d0528 100644
}
diff --git a/drivers/video/console/cfbcondecor.c b/drivers/video/console/cfbcondecor.c
new file mode 100644
-index 000000000000..8a4d926b3342
+index 000000000000..a2b44971f05b
--- /dev/null
+++ b/drivers/video/console/cfbcondecor.c
-@@ -0,0 +1,470 @@
+@@ -0,0 +1,471 @@
+/*
+ * linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions
+ *
@@ -776,14 +777,14 @@ index 000000000000..8a4d926b3342
+ /* left margin */
+ decorfill(info, vc->vc_decor.ty, 0, th, vc->vc_decor.tx);
+ /* right margin */
-+ decorfill(info, vc->vc_decor.ty, vc->vc_decor.tx + tw, th,
++ decorfill(info, vc->vc_decor.ty, vc->vc_decor.tx + tw, th,
+ info->var.xres - vc->vc_decor.tx - tw);
+ }
-+ decorfill(info, vc->vc_decor.ty + th, 0,
++ decorfill(info, vc->vc_decor.ty + th, 0,
+ info->var.yres - vc->vc_decor.ty - th, info->var.xres);
+}
+
-+void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y,
++void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y,
+ int sx, int dx, int width)
+{
+ u16 *d = (u16 *) (vc->vc_origin + vc->vc_size_row * y + dx * 2);
@@ -832,8 +833,9 @@ index 000000000000..8a4d926b3342
+ fbcon_decor_clear_margins(vc, info, 0);
+ }
+}
++
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index 4e3c78d88832..d45282a3be11 100644
+index 4e3c78d88832..ed56cec16dff 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -79,6 +79,7 @@
@@ -898,10 +900,10 @@ index 4e3c78d88832..d45282a3be11 100644
fbcon_clear_margins(vc, 0);
}
-+ if (fbcon_decor_active(info, vc)) {
-+ fbcon_decor_clear(vc, info, sy, sx, height, width);
-+ return;
-+ }
++ if (fbcon_decor_active(info, vc)) {
++ fbcon_decor_clear(vc, info, sy, sx, height, width);
++ return;
++ }
+
/* Split blits that cross physical y_wrap boundary */
@@ -933,9 +935,9 @@ index 4e3c78d88832..d45282a3be11 100644
- if (!fbcon_is_inactive(vc, info))
- ops->clear_margins(vc, info, bottom_only);
+ if (!fbcon_is_inactive(vc, info)) {
-+ if (fbcon_decor_active(info, vc)) {
-+ fbcon_decor_clear_margins(vc, info, bottom_only);
-+ } else {
++ if (fbcon_decor_active(info, vc)) {
++ fbcon_decor_clear_margins(vc, info, bottom_only);
++ } else {
+ ops->clear_margins(vc, info, bottom_only);
+ }
+ }
@@ -966,10 +968,10 @@ index 4e3c78d88832..d45282a3be11 100644
}
+
+ if (fbcon_decor_active(info, vc) && sy == dy && height == 1) {
-+ /* must use slower redraw bmove to keep background pic intact */
-+ fbcon_decor_bmove_redraw(vc, info, sy, sx, dx, width);
-+ return;
-+ }
++ /* must use slower redraw bmove to keep background pic intact */
++ fbcon_decor_bmove_redraw(vc, info, sy, sx, dx, width);
++ return;
++ }
+
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
@@ -1193,7 +1195,7 @@ index 4e3c78d88832..d45282a3be11 100644
diff --git a/drivers/video/console/fbcondecor.c b/drivers/video/console/fbcondecor.c
new file mode 100644
-index 000000000000..cba4654daf37
+index 000000000000..babc8c5ed306
--- /dev/null
+++ b/drivers/video/console/fbcondecor.c
@@ -0,0 +1,555 @@
@@ -1455,11 +1457,11 @@ index 000000000000..cba4654daf37
+ return -ENOMEM;
+
+ if (copy_from_user(tmp,
-+ (void __user*)img->cmap.red, (img->cmap.len << 1)) ||
++ (void __user*)img->cmap.red, (img->cmap.len << 1)) ||
+ copy_from_user(tmp + (img->cmap.len << 1),
-+ (void __user*)img->cmap.green, (img->cmap.len << 1)) ||
++ (void __user*)img->cmap.green, (img->cmap.len << 1)) ||
+ copy_from_user(tmp + (img->cmap.len << 2),
-+ (void __user*)img->cmap.blue, (img->cmap.len << 1))) {
++ (void __user*)img->cmap.blue, (img->cmap.len << 1))) {
+ vfree(tmp);
+ return -EFAULT;
+ }
@@ -1754,11 +1756,11 @@ index 000000000000..cba4654daf37
+EXPORT_SYMBOL(fbcon_decor_path);
diff --git a/drivers/video/console/fbcondecor.h b/drivers/video/console/fbcondecor.h
new file mode 100644
-index 000000000000..66abe0206ba2
+index 000000000000..3b3724b8776e
--- /dev/null
+++ b/drivers/video/console/fbcondecor.h
@@ -0,0 +1,78 @@
-+/*
++/*
+ * linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers
+ *
+ * Copyright (C) 2004 Michal Januszewski <michalj+fbcondecor@gmail.com>
@@ -1802,7 +1804,7 @@ index 000000000000..66abe0206ba2
+void do_unblank_screen(int entering_gfx);
+
+/* struct vc_data *y */
-+#define fbcon_decor_active_vc(y) (y->vc_decor.state && y->vc_decor.theme)
++#define fbcon_decor_active_vc(y) (y->vc_decor.state && y->vc_decor.theme)
+
+/* struct fb_info *x, struct vc_data *y */
+#define fbcon_decor_active_nores(x,y) (x->bgdecor.data && fbcon_decor_active_vc(y))
@@ -1849,7 +1851,7 @@ index 3543e3e4cfb5..cfc7f2ab6ad5 100644
---help---
Say Y here if you have a Matrox Millennium, Matrox Millennium II,
diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
-index 68a113594808..21f977cb59d2 100644
+index 68a113594808..ee23443873d1 100644
--- a/drivers/video/fbdev/core/fbcmap.c
+++ b/drivers/video/fbdev/core/fbcmap.c
@@ -17,6 +17,8 @@
@@ -1861,7 +1863,13 @@ index 68a113594808..21f977cb59d2 100644
static u16 red2[] __read_mostly = {
0x0000, 0xaaaa
};
-@@ -256,9 +258,12 @@ int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *info)
+@@ -251,14 +253,17 @@ int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *info)
+ if (transp)
+ htransp = *transp++;
+ if (info->fbops->fb_setcolreg(start++,
+- hred, hgreen, hblue,
++ hred, hgreen, hblue,
+ htransp, info))
break;
}
}
@@ -2019,7 +2027,7 @@ index 3d003805aac3..199642c926a3 100644
void *par;
/* we need the PCI or similar aperture base/size not
diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h
-index fb795c3b3c17..b7f7e4a1dcb5 100644
+index fb795c3b3c17..dc77a0330d08 100644
--- a/include/uapi/linux/fb.h
+++ b/include/uapi/linux/fb.h
@@ -8,6 +8,25 @@
@@ -2070,7 +2078,7 @@ index fb795c3b3c17..b7f7e4a1dcb5 100644
+#define FBCON_DECOR_THEME_LEN 128 /* Maximum lenght of a theme name */
+#define FBCON_DECOR_IO_ORIG_KERNEL 0 /* Kernel ioctl origin */
+#define FBCON_DECOR_IO_ORIG_USER 1 /* User ioctl origin */
-+
++
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */
#define FB_TYPE_INTERLEAVED_PLANES 2 /* Interleaved planes */
diff --git a/sys-kernel/boest-v4.4.150/0015-4.4-4567_distro-Gentoo-Kconfig.patch.patch b/sys-kernel/boest-v4.4.152/0015-4.4-4567_distro-Gentoo-Kconfig.patch.patch
index 64210044..1cf00548 100644
--- a/sys-kernel/boest-v4.4.150/0015-4.4-4567_distro-Gentoo-Kconfig.patch.patch
+++ b/sys-kernel/boest-v4.4.152/0015-4.4-4567_distro-Gentoo-Kconfig.patch.patch
@@ -1,4 +1,4 @@
-From 47acc2829c7d15d82d8f62df6fda8fdcf1ec7df3 Mon Sep 17 00:00:00 2001
+From a31ef89b21efe4fcc47ab77faa244a5f425433e0 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Thu, 2 Mar 2017 11:16:08 -0500
Subject: [PATCH 15/20] 4.4:4567_distro-Gentoo-Kconfig.patch
diff --git a/sys-kernel/boest-v4.4.150/0016-This-patch-has-been-tested-on-and-known-to-work-with.patch b/sys-kernel/boest-v4.4.152/0016-This-patch-has-been-tested-on-and-known-to-work-with.patch
index 280fd689..5f0cddac 100644
--- a/sys-kernel/boest-v4.4.150/0016-This-patch-has-been-tested-on-and-known-to-work-with.patch
+++ b/sys-kernel/boest-v4.4.152/0016-This-patch-has-been-tested-on-and-known-to-work-with.patch
@@ -1,4 +1,4 @@
-From 2804d4da162fc4970bf8f6f0a4f51ef8b9c61d14 Mon Sep 17 00:00:00 2001
+From b908b614dd5f8a0b85b867db409e9bdac2c28ab7 Mon Sep 17 00:00:00 2001
From: Mike Pagano <mpagano@gentoo.org>
Date: Sun, 10 Jan 2016 12:18:55 -0500
Subject: [PATCH 16/20] This patch has been tested on and known to work with
diff --git a/sys-kernel/boest-v4.4.150/0017-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch b/sys-kernel/boest-v4.4.152/0017-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch
index 7c8d8f65..9978dca5 100644
--- a/sys-kernel/boest-v4.4.150/0017-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch
+++ b/sys-kernel/boest-v4.4.152/0017-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch
@@ -1,4 +1,4 @@
-From 1174b4a55ce631e34deacbe751fd3ca5194abf91 Mon Sep 17 00:00:00 2001
+From 4d7667001167f47b0261562d44105ac2cc4cb37f Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it>
Date: Tue, 7 Apr 2015 13:39:12 +0200
Subject: [PATCH 17/20] block: cgroups, kconfig, build bits for BFQ-v7r11-4.7.0
diff --git a/sys-kernel/boest-v4.4.150/0018-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch b/sys-kernel/boest-v4.4.152/0018-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch
index 5b11bd5e..7f199c9f 100644
--- a/sys-kernel/boest-v4.4.150/0018-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch
+++ b/sys-kernel/boest-v4.4.152/0018-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch
@@ -1,4 +1,4 @@
-From 62c3a734230bf7223228d208b0c9db7caeabb4eb Mon Sep 17 00:00:00 2001
+From 1536e9cf5edf3984e89cce4d5062f2821bb1fb2a Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it>
Date: Thu, 9 May 2013 19:10:02 +0200
Subject: [PATCH 18/20] block: introduce the BFQ-v7r11 I/O sched for 4.7.0
diff --git a/sys-kernel/boest-v4.4.150/0019-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch b/sys-kernel/boest-v4.4.152/0019-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
index 2be5af9c..26601f3e 100644
--- a/sys-kernel/boest-v4.4.150/0019-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
+++ b/sys-kernel/boest-v4.4.152/0019-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
@@ -1,4 +1,4 @@
-From 1ebc0c00765e03604292b090d3a48d97793c0a3e Mon Sep 17 00:00:00 2001
+From 7d6485a68fc1d570f02726c48c8f732606dcaf10 Mon Sep 17 00:00:00 2001
From: Mauro Andreolini <mauro.andreolini@unimore.it>
Date: Sun, 6 Sep 2015 16:09:05 +0200
Subject: [PATCH 19/20] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r11
diff --git a/sys-kernel/boest-v4.4.150/0020-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch b/sys-kernel/boest-v4.4.152/0020-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch
index b9ec59c6..9f832ea7 100644
--- a/sys-kernel/boest-v4.4.150/0020-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch
+++ b/sys-kernel/boest-v4.4.152/0020-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch
@@ -1,4 +1,4 @@
-From 5595af3e05866b2e02eb60af579373bb272e2361 Mon Sep 17 00:00:00 2001
+From 4f47710d66133f2f375d25a5244f87ffa5b8eabd Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@linaro.org>
Date: Tue, 17 May 2016 08:28:04 +0200
Subject: [PATCH 20/20] block, bfq: turn BFQ-v7r11 for 4.7.0 into BFQ-v8r3 for
diff --git a/sys-kernel/longterm-sources-4.4.150 b/sys-kernel/longterm-sources-4.4.150
deleted file mode 120000
index fcde7868..00000000
--- a/sys-kernel/longterm-sources-4.4.150
+++ /dev/null
@@ -1 +0,0 @@
-boest-v4.4.150 \ No newline at end of file
diff --git a/sys-kernel/longterm-sources-4.4.152 b/sys-kernel/longterm-sources-4.4.152
new file mode 120000
index 00000000..d34d442e
--- /dev/null
+++ b/sys-kernel/longterm-sources-4.4.152
@@ -0,0 +1 @@
+boest-v4.4.152 \ No newline at end of file