Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

10 files changed, 6 insertions, 18 deletions

diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 9c613e0e6..cb4ac9ad7 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -46,8 +46,8 @@ sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
             'a6bc6d96b63ef746b7ccfe6ffb20df1e50459027f3db9f7a7f0b6b2db7f2c6e4'
             '1f2cb71892020365e8f064182ddc2f534d8bae2c89f8733775e683795ae67642'
             'SKIP'
-            '0fe0836dfa1df977312a4f15f25baf558a7fa1293c6c1a258f9d7b5492e054b4'
-            '64527518bebdffdc4c40ee78f55f8dc54e079dac5a0ec32cf2cb28a93112529b'
+            'f96955787076629a8ad7b506c33bf0ba9afa312db9781db74c009ac64288aa71'
+            '56903bdb21b3a539f0982c3f601276d84a0147c1e3685c1559969a01380698e3'
             '54062ad5a1200fdb1a5a13fed316dbe74fbcfba87e37245328f94960d21aa365'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686
index c4ffc29e1..de8cf4509 100644
--- a/libre/linux-libre-grsec/config.i686
+++ b/libre/linux-libre-grsec/config.i686
@@ -4493,7 +4493,6 @@ CONFIG_DRM_PTN3460=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64
index 5333ddfe7..9ab445cf5 100644
--- a/libre/linux-libre-grsec/config.x86_64
+++ b/libre/linux-libre-grsec/config.x86_64
@@ -4320,7 +4320,6 @@ CONFIG_DRM_PTN3460=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 8c6cf6a68..33ee9449e 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '3.14.14-a410a5e2b7-loongson-community.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'e7344442b842212a93737f8ca274f224abb52e8aa138568f2330143f7fba22a6'
-            'fac409e803e02fd37dece4eacadf387739139be28c93db60400c723ba4ff83de'
-            '5f3aac4a2ed06d4de18fc2965d091c073ef3b5d57c0f4884d20d00f9018e0ba2'
+            '2049fdfbf251beb2656c3fe068d0b1e51d4699f96d2be7a17319c245eaf77f88'
+            'a61dbe63c83aba06cf6ebffdb2a30c9294fadcefcac5072f755923b830a9feca'
             'b053633d23d85972e5a99a83dc93bdab9b8aa1ab8450e98e3b84b46faa669fef'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 41057945f..b9973265b 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -4434,7 +4434,6 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 767cdcf2d..55a88a51a 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -4301,7 +4301,6 @@ CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index 592ae2c9b..36665a4ed 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,8 +1,3 @@
-2014-09-09  André Silva  <emulatorman@parabola.nu>
-
-	* linux-libre-3.16.2_gnu-1
-	* Enabled CONFIG_DRM_RADEON_KMS [4]
-
 2014-08-31  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.16.1_gnu-1.3
@@ -53,4 +48,3 @@
 [1] https://labs.parabola.nu/issues/47
 [2] https://labs.parabola.nu/issues/90
 [3] https://labs.parabola.nu/issues/116
-[4] https://lists.parabolagnulinux.org/pipermail/assist/2014-September/000281.html
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index c607a5c64..be7a7ef4c 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -37,8 +37,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '3.16-7981337ad0-loongson-community.patch')
 sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
             'a6bc6d96b63ef746b7ccfe6ffb20df1e50459027f3db9f7a7f0b6b2db7f2c6e4'
-            '8ba899e4ced53f52696ea1cfbd17a60b245256d47a17e38f50eca378d672ba90'
-            '6a006447fa03e1c4fb077fc20425f7af7949213206c1737545a0d60509dbc31f'
+            '8ab010f8c08fc4fa7c801495831d567e67b6a5fe03cd5c875f8b08ea1ce69d33'
+            '375e74050b11f5ba0e4544106971fa58cc74062d9d2f602ea3f6e46b7fac8ddd'
             '44e9c253df7a7d1457e01f36dbd93f7c713c7e02e8a56f6e85a287f35e556bce'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index e33f8cf65..257047e33 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -4509,7 +4509,6 @@ CONFIG_DRM_PTN3460=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index d9dfe452d..5d674c6e2 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -4350,7 +4350,6 @@ CONFIG_DRM_PTN3460=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5