[arch-commits] Commit in linux/trunk (4 files)
Date: Tuesday, June 12, 2018 @ 19:12:42 Author: heftig Revision: 326858 4.17.1-1 Added: linux/trunk/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch Modified: linux/trunk/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch linux/trunk/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch linux/trunk/PKGBUILD -+ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch |6 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch | 10 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch | 132 ++ PKGBUILD| 17 - 4 files changed, 152 insertions(+), 13 deletions(-) Modified: 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch === --- 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-06-12 19:05:30 UTC (rev 326857) +++ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-06-12 19:12:42 UTC (rev 326858) @@ -1,8 +1,8 @@ -From b7e3d341f20581dcd72d3640fa8f6f99fd766d21 Mon Sep 17 00:00:00 2001 -Message-Id: +From 9a5adbc45b1c7d43fe4b27936f2a6939660617a1 Mon Sep 17 00:00:00 2001 +Message-Id: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steff...@gmail.com> From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn Modified: 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch === --- 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch 2018-06-12 19:05:30 UTC (rev 326857) +++ 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch 2018-06-12 19:12:42 UTC (rev 326858) @@ -1,10 +1,10 @@ -From 997fbfe5508bc7d29fdf0a7a103f3864d4db380a Mon Sep 17 00:00:00 2001 -Message-Id: <997fbfe5508bc7d29fdf0a7a103f3864d4db380a.1528140572.git.jan.steff...@gmail.com> -In-Reply-To: -References: +From 6cc33158e691a70111672a6105c7a37e66e6d3c3 Mon Sep 17 00:00:00 2001 +Message-Id: <6cc33158e691a70111672a6105c7a37e66e6d3c3.1528777685.git.jan.steff...@gmail.com> +In-Reply-To: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steff...@gmail.com> +References: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steff...@gmail.com> From: Jani Nikula Date: Wed, 16 May 2018 11:01:10 +0300 -Subject: [PATCH 2/2] Revert "drm/i915/edp: Allow alternate fixed mode for eDP +Subject: [PATCH 2/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP if available." This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e. Added: 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch === --- 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch (rev 0) +++ 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch 2018-06-12 19:12:42 UTC (rev 326858) @@ -0,0 +1,132 @@ +From 1e45a10dbea00f3a9ead21a9b3d25ad00021261d Mon Sep 17 00:00:00 2001 +Message-Id: <1e45a10dbea00f3a9ead21a9b3d25ad00021261d.1528777685.git.jan.steff...@gmail.com> +In-Reply-To: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steff...@gmail.com> +References: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steff...@gmail.com> +From: Mika Westerberg +Date: Tue, 22 May 2018 14:16:50 +0300 +Subject: [PATCH 3/3] ACPI / watchdog: Prefer iTCO_wdt always when WDAT table + uses RTC SRAM + +After we added quirk for Lenovo Z50-70 it turns out there are at least +two more systems where WDAT table includes instructions accessing RTC +SRAM. Instead of quirking each system separately, look for such +instructions in the table and automatically prefer iTCO_wdt if found. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033 +Reported-by: Arnold Guy +Reported-by: Alois Nespor +Reported-by: Yury Pakin +Reported-by: Ihor Chyhin +Signed-off-by: Mika Westerberg +Acked-by: Guenter Roeck +--- + drivers/acpi/acpi_watchdog.c | 72 ++-- + 1 file changed, 45 insertions(+), 27 deletions(-) + +diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c +index 4bde16fb97d8..95600309ce42 100644 +--- a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c +@@ -12,54 +12,72 @@ + #define pr_fmt(fmt) "ACPI: watchdog: " fmt + + #include +-#include + #include + #include + + #include "internal.h" + +-static const struct dmi_system_id acpi_watchdog_skip[] = { +- { +- /* +- * On Lenovo Z50-70 there are two issues with the WDAT +- * table. First some of the instructions use RTC
[arch-commits] Commit in linux/trunk (4 files)
Date: Friday, April 6, 2018 @ 23:33:43 Author: heftig Revision: 321282 4.16-2 Added: linux/trunk/0003-Partially-revert-swiotlb-remove-various-exports.patch Modified: linux/trunk/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch linux/trunk/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch linux/trunk/PKGBUILD -+ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch |6 +- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 10 +-- 0003-Partially-revert-swiotlb-remove-various-exports.patch | 29 ++ PKGBUILD| 11 ++- 4 files changed, 45 insertions(+), 11 deletions(-) Modified: 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch === --- 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-04-06 23:16:28 UTC (rev 321281) +++ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-04-06 23:33:43 UTC (rev 321282) @@ -1,8 +1,8 @@ From ed80ff656462322e0bc7813d736800321097e10a Mon Sep 17 00:00:00 2001 -Message-Id:+Message-Id: From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn @@ -99,5 +99,5 @@ static DEFINE_MUTEX(userns_state_mutex); -- -2.16.3 +2.17.0 Modified: 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch === --- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-04-06 23:16:28 UTC (rev 321281) +++ 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-04-06 23:33:43 UTC (rev 321282) @@ -1,10 +1,10 @@ From 7f7ff058a768b93f6a8592f3540471a93aef9a27 Mon Sep 17 00:00:00 2001 -Message-Id: <7f7ff058a768b93f6a8592f3540471a93aef9a27.1522624056.git.jan.steff...@gmail.com> -In-Reply-To: -References: +Message-Id: <7f7ff058a768b93f6a8592f3540471a93aef9a27.1523024759.git.jan.steff...@gmail.com> +In-Reply-To: +References: From: Jim Bride Date: Mon, 6 Nov 2017 13:38:57 -0800 -Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's +Subject: [PATCH 2/3] drm/i915/edp: Only use the alternate fixed mode if it's asked for In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for @@ -38,5 +38,5 @@ } -- -2.16.3 +2.17.0 Added: 0003-Partially-revert-swiotlb-remove-various-exports.patch === --- 0003-Partially-revert-swiotlb-remove-various-exports.patch (rev 0) +++ 0003-Partially-revert-swiotlb-remove-various-exports.patch 2018-04-06 23:33:43 UTC (rev 321282) @@ -0,0 +1,29 @@ +From b7c4c2b34e729c1f6f617a8e2aa1dec3e28fdf5c Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: +From: "Jan Alexander Steffens (heftig)" +Date: Fri, 6 Apr 2018 16:19:38 +0200 +Subject: [PATCH 3/3] Partially revert "swiotlb: remove various exports" + +This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec. +The proprietary NVIDIA driver needs one of the exports. +--- + lib/swiotlb.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/swiotlb.c b/lib/swiotlb.c +index c43ec2271469..77d699f14af7 100644 +--- a/lib/swiotlb.c b/lib/swiotlb.c +@@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, + } + return nelems; + } ++EXPORT_SYMBOL(swiotlb_map_sg_attrs); + + /* + * Unmap a set of streaming mode DMA translations. Again, cpu read rules +-- +2.17.0 + Modified: PKGBUILD === --- PKGBUILD2018-04-06 23:16:28 UTC (rev 321281) +++ PKGBUILD2018-04-06 23:33:43 UTC (rev 321282) @@ -6,7 +6,7 @@ #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-4.16
[arch-commits] Commit in linux/trunk (4 files)
Date: Tuesday, April 3, 2018 @ 01:22:17 Author: heftig Revision: 320872 4.16-1 Modified: linux/trunk/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch linux/trunk/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch linux/trunk/PKGBUILD linux/trunk/config -+ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 18 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 14 PKGBUILD| 21 config | 318 ++ 4 files changed, 225 insertions(+), 146 deletions(-) Modified: 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch === --- 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-04-02 23:59:06 UTC (rev 320871) +++ 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 2018-04-03 01:22:17 UTC (rev 320872) @@ -1,5 +1,5 @@ -From 188720e92122385994143a06cb16a930053eb503 Mon Sep 17 00:00:00 2001 -Message-Id: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steff...@gmail.com> +From ed80ff656462322e0bc7813d736800321097e10a Mon Sep 17 00:00:00 2001 +Message-Id:From: Serge Hallyn Date: Fri, 31 May 2013 19:12:12 +0100 Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by @@ -15,10 +15,10 @@ 3 files changed, 30 insertions(+) diff --git a/kernel/fork.c b/kernel/fork.c -index 2295fc69717f..6f320a216e7d 100644 +index e5d9d405ae4e..c4be89c51f25 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -102,6 +102,11 @@ +@@ -103,6 +103,11 @@ #define CREATE_TRACE_POINTS #include @@ -30,7 +30,7 @@ /* * Minimum number of threads to boot the kernel -@@ -1550,6 +1555,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1591,6 +1596,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -41,7 +41,7 @@ /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -2343,6 +2352,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -2385,6 +2394,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -55,7 +55,7 @@ if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 557d46728577..c19d7a828913 100644 +index f98f28c12020..7256d339a32a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -105,6 +105,9 @@ extern int core_uses_pid; @@ -68,7 +68,7 @@ extern int pid_max; extern int pid_max_min, pid_max_max; extern int percpu_pagelist_fraction; -@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = { +@@ -515,6 +518,15 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif @@ -99,5 +99,5 @@ static DEFINE_MUTEX(userns_state_mutex); -- -2.16.2 +2.16.3 Modified: 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch === --- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-04-02 23:59:06 UTC (rev 320871) +++ 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-04-03 01:22:17 UTC (rev 320872) @@ -1,7 +1,7 @@ -From 704e31424615c87ad82424a9b09a452d762daed0 Mon Sep 17 00:00:00 2001 -Message-Id: <704e31424615c87ad82424a9b09a452d762daed0.1520639721.git.jan.steff...@gmail.com> -In-Reply-To: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steff...@gmail.com> -References: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steff...@gmail.com> +From 7f7ff058a768b93f6a8592f3540471a93aef9a27 Mon Sep 17 00:00:00 2001 +Message-Id: <7f7ff058a768b93f6a8592f3540471a93aef9a27.1522624056.git.jan.steff...@gmail.com> +In-Reply-To: +References: From: Jim Bride Date: Mon, 6 Nov 2017 13:38:57 -0800 Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's @@ -24,10 +24,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index add4b2434aa3..14a8bef9fdfe 100644 +index a29868cd30c7..b6d07b615b12 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -1616,7 +1616,8 @@ static bool
[arch-commits] Commit in linux/trunk (4 files)
Date: Thursday, December 14, 2017 @ 21:53:24 Author: heftig Revision: 312893 4.14.6-1 Added: linux/trunk/0001-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch linux/trunk/0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch Modified: linux/trunk/PKGBUILD linux/trunk/config -+ 0001-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch | 73 ++ 0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch | 57 +++ PKGBUILD| 18 +- config | 19 +- 4 files changed, 154 insertions(+), 13 deletions(-) Added: 0001-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch === --- 0001-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch (rev 0) +++ 0001-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch 2017-12-14 21:53:24 UTC (rev 312893) @@ -0,0 +1,73 @@ +From c3c1af44db713ac6624e729ea4832d0ce70685e0 Mon Sep 17 00:00:00 2001 +Message-Id:+From: Benjamin Poirier +Date: Mon, 11 Dec 2017 16:26:40 +0900 +Subject: [PATCH 1/2] e1000e: Fix e1000_check_for_copper_link_ich8lan return + value. + +e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan() +are the two functions that may be assigned to mac.ops.check_for_link when +phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e: +Separate signaling for link check/link up") changed the meaning of the +return value of check_for_link for copper media but only adjusted the first +function. This patch adjusts the second function likewise. + +Reported-by: Christian Hesse +Reported-by: Gabriel C +Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047 +Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up") +Tested-by: Christian Hesse +Signed-off-by: Benjamin Poirier +--- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 --- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c +index d6d4ed7acf031172..31277d3bb7dc1241 100644 +--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c +@@ -1367,22 +1367,25 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) + * Checks to see of the link status of the hardware has changed. If a + * change in link status has been detected, then we read the PHY registers + * to get the current speed/duplex if link exists. ++ * ++ * Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link ++ * up). + **/ + static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) + { + struct e1000_mac_info *mac = >mac; + s32 ret_val, tipg_reg = 0; + u16 emi_addr, emi_val = 0; + bool link; + u16 phy_reg; + + /* We only want to go out to the PHY registers to see if Auto-Neg +* has completed and/or if our link status has changed. The +* get_link_status flag is set upon receiving a Link Status +* Change or Rx Sequence Error interrupt. +*/ + if (!mac->get_link_status) +- return 0; ++ return 1; + + /* First we want to see if the MII Status Register reports +* link. If so, then we want to get the current speed/duplex +@@ -1613,10 +1616,12 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) +* different link partner. +*/ + ret_val = e1000e_config_fc_after_link_up(hw); +- if (ret_val) ++ if (ret_val) { + e_dbg("Error configuring flow control\n"); ++ return ret_val; ++ } + +- return ret_val; ++ return 1; + } + + static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) +-- +2.15.1 + Added: 0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch === --- 0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch (rev 0) +++ 0002-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch 2017-12-14 21:53:24 UTC (rev 312893) @@ -0,0 +1,57 @@ +From 80d3e994e0631d9135cadf20a0b5ad483d7e9bbb Mon Sep 17 00:00:00 2001 +Message-Id: <80d3e994e0631d9135cadf20a0b5ad483d7e9bbb.1513282811.git.jan.steff...@gmail.com> +In-Reply-To: +References: +From: Mohamed Ghannam +Date: Tue, 5 Dec 2017 20:58:35 + +Subject:
[arch-commits] Commit in linux/trunk (4 files)
Date: Saturday, November 18, 2017 @ 22:46:07 Author: heftig Revision: 310406 4.14-2: with depmod hook Added: linux/trunk/60-linux.hook Modified: linux/trunk/90-linux.hook linux/trunk/PKGBUILD linux/trunk/linux.install ---+ 60-linux.hook | 12 +++ 90-linux.hook |2 - PKGBUILD | 59 +--- linux.install | 17 4 files changed, 48 insertions(+), 42 deletions(-) Added: 60-linux.hook === --- 60-linux.hook (rev 0) +++ 60-linux.hook 2017-11-18 22:46:07 UTC (rev 310406) @@ -0,0 +1,12 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/modules/%KERNVER%/* +Target = usr/lib/modules/%EXTRAMODULES%/* + +[Action] +Description = Updating %PKGBASE% module dependencies... +When = PostTransaction +Exec = /usr/bin/depmod %KERNVER% Modified: 90-linux.hook === --- 90-linux.hook 2017-11-18 22:43:42 UTC (rev 310405) +++ 90-linux.hook 2017-11-18 22:46:07 UTC (rev 310406) @@ -6,6 +6,6 @@ Target = usr/lib/initcpio/* [Action] -Description = Updating %PKGBASE% initcpios +Description = Updating %PKGBASE% initcpios... When = PostTransaction Exec = /usr/bin/mkinitcpio -p %PKGBASE% Modified: PKGBUILD === --- PKGBUILD2017-11-18 22:43:42 UTC (rev 310405) +++ PKGBUILD2017-11-18 22:46:07 UTC (rev 310406) @@ -6,7 +6,7 @@ #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-4.14 pkgver=4.14 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://www.kernel.org/; license=('GPL2') @@ -18,6 +18,7 @@ #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz; #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign; 'config' # the main kernel config file + '60-linux.hook' # pacman hook for depmod '90-linux.hook' # pacman hook for initramfs regeneration 'linux.preset' # standard config files for mkinitcpio ramdisk '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch' @@ -29,7 +30,8 @@ sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7' 'SKIP' 'a68e94064f040d60e8e4c3380efeee085b54d252d527e960dd17ac688505d5b6' -'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' +'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' +'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd') @@ -98,23 +100,18 @@ _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} - mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + mkdir -p "${pkgdir}"/{boot,lib/{modules,firmware},usr} make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" - # set correct depmod command for install - sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \ -"${startdir}/${install}" > "${startdir}/${install}.pkg" - true && install=${install}.pkg + # make room for external modules + local _extramodules="extramodules-${_basekernel}${_kernelname:--ARCH}" + ln -s "../${_extramodules}" "${pkgdir}/lib/modules/${_kernver}/extramodules" - # install mkinitcpio preset file for kernel - sed "s|%PKGBASE%|${pkgbase}|g" ../linux.preset | -install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + # add real version for building modules and running depmod from hook + echo "${_kernver}" | +install -Dm644 /dev/stdin "${pkgdir}/lib/modules/${_extramodules}/version" - # install pacman hook for initramfs regeneration - sed "s|%PKGBASE%|${pkgbase}|g" ../90-linux.hook | -install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook" - # remove build and source links rm "${pkgdir}"/lib/modules/${_kernver}/{source,build} @@ -121,21 +118,35 @@ # remove the firmware rm -r "${pkgdir}/lib/firmware" - # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + # now we call depmod... + depmod -b "${pkgdir}" -F System.map "${_kernver}" - # add real version for building modules and running depmod from post_install/upgrade - echo "${_kernver}" | -install -Dm644 /dev/stdin "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" + # add vmlinux + install -Dt "${pkgdir}/lib/modules/${_kernver}/build" -m644 vmlinux - # Now we call depmod... - depmod -b "${pkgdir}" -F System.map "${_kernver}" - # move module tree /lib -> /usr/lib
[arch-commits] Commit in linux/trunk (4 files)
Date: Friday, August 18, 2017 @ 14:41:03 Author: foutrelis Revision: 302376 upgpkg: linux 4.12.8-2 - Revert PIE base address change which breaks AddressSanitizer (FS#55008). - Fix two regressions with bonding on wireless (FS#54922). Added: linux/trunk/bonding-ratelimit-failed-speed-duplex-update-warning.patch linux/trunk/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch linux/trunk/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch Modified: linux/trunk/PKGBUILD + PKGBUILD | 16 ++ bonding-ratelimit-failed-speed-duplex-update-warning.patch | 47 +++ bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch | 68 +++ mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch | 35 + 4 files changed, 165 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-08-18 12:31:27 UTC (rev 302375) +++ PKGBUILD2017-08-18 14:41:03 UTC (rev 302376) @@ -6,7 +6,7 @@ #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-4.12 pkgver=4.12.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="https://www.kernel.org/; license=('GPL2') @@ -16,6 +16,9 @@ "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign; "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz; "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign; +'bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch' +'bonding-ratelimit-failed-speed-duplex-update-warning.patch' +'mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch' # the main kernel config files 'config.i686' 'config.x86_64' # pacman hook for initramfs regeneration @@ -27,6 +30,9 @@ 'SKIP' '32b860911a3bafd5cd5bc813a427c90fad6eafdf607fa64e1b763b16ab605636' 'SKIP' +'48e0505438bb4ccc7a0e050a896122b490e8f1b1446aa3833841a9d4d7853d68' +'fc606711a922638d5cc4358f47f69f554d9e6eab1cec91f0b49f00911f399722' +'b830ce777543c0edd20a77d70f204c095f2429bb37151cd4a8c9dfae2af8d51a' 'df55887a43dcbb6bd35fd2fb1ec841427b6ea827334c0880cbc256d4f042a7a1' 'bf84528c592d1841bba0662242f0339a24a1de384c31f28248631e8be9446586' '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' @@ -49,6 +55,14 @@ # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # https://bugzilla.kernel.org/show_bug.cgi?id=196547 + patch -Np1 -i ../bonding-ratelimit-failed-speed-duplex-update-warning.patch + patch -Np1 -i ../bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch + + # https://github.com/google/sanitizers/issues/837 + # https://patchwork.kernel.org/patch/9886105/ + patch -Np1 -i ../mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch + cat "${srcdir}/config.${CARCH}" > ./.config if [ "${_kernelname}" != "" ]; then Added: bonding-ratelimit-failed-speed-duplex-update-warning.patch === --- bonding-ratelimit-failed-speed-duplex-update-warning.patch (rev 0) +++ bonding-ratelimit-failed-speed-duplex-update-warning.patch 2017-08-18 14:41:03 UTC (rev 302376) @@ -0,0 +1,47 @@ +From 11e9d7829dd08dbafb24517fe922f11c3a8a9dc2 Mon Sep 17 00:00:00 2001 +From: Andreas Born+Date: Sat, 12 Aug 2017 00:36:55 +0200 +Subject: [PATCH] bonding: ratelimit failed speed/duplex update warning + +bond_miimon_commit() handles the UP transition for each slave of a bond +in the case of MII. It is triggered 10 times per second for the default +MII Polling interval of 100ms. For device drivers that do not implement +__ethtool_get_link_ksettings() the call to bond_update_speed_duplex() +fails persistently while the MII status could remain UP. That is, in +this and other cases where the speed/duplex update keeps failing over a +longer period of time while the MII state is UP, a warning is printed +every MII polling interval. + +To address these excessive warnings net_ratelimit() should be used. +Printing a warning once would not be sufficient since the call to +bond_update_speed_duplex() could recover to succeed and fail again +later. In that case there would be no new indication what went wrong. + +Fixes: b5bf0f5b16b9c (bonding: correctly update link status during mii-commit phase) +Signed-off-by: Andreas Born +Signed-off-by: David S. Miller +--- + drivers/net/bonding/bond_main.c | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c +index 85bb272d2a34..fc63992ab0e0 100644 +--- a/drivers/net/bonding/bond_main.c
[arch-commits] Commit in linux/trunk (4 files)
Date: Wednesday, December 21, 2016 @ 19:02:35 Author: heftig Revision: 284387 Prepare 4.9 Modified: linux/trunk/PKGBUILD linux/trunk/config linux/trunk/config.x86_64 Deleted: linux/trunk/net_handle_no_dst_on_skb_in_icmp6_send.patch --+ PKGBUILD | 23 -- config | 246 +++-- config.x86_64| 214 ++--- net_handle_no_dst_on_skb_in_icmp6_send.patch | 68 -- 4 files changed, 311 insertions(+), 240 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-12-21 13:25:19 UTC (rev 284386) +++ PKGBUILD2016-12-21 19:02:35 UTC (rev 284387) @@ -4,8 +4,8 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name -_srcname=linux-4.8 -pkgver=4.8.14 +_srcname=linux-4.9 +pkgver=4.9 pkgrel=1 arch=('i686' 'x86_64') url="https://www.kernel.org/; @@ -14,8 +14,8 @@ options=('!strip') source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz; "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign; -"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz; -"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign; +#"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz; +#"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign; # the main kernel config files 'config' 'config.x86_64' # pacman hook for initramfs regeneration @@ -23,20 +23,16 @@ # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' -net_handle_no_dst_on_skb_in_icmp6_send.patch 0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch ) -sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a' +sha256sums=('029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a' 'SKIP' -'efa9b7d87a6ca67426e3d7f206ac987eb7cb31602ad2011e81060626de790fcb' -'SKIP' -'2ac8818414beb7dbacbd3ad450c516e6ada804827132a7132f63b8189e5f5151' -'41b9a64542befd2fea170776e8ec22a7d158dd3273633afc9b91662c448cd90a' +'819ae72791efee259cc8e7575b6ed7e61da021577620a0ddadb9085beb5b' +'faff71d141ede8cd29713035cd504b96d2edc8c85e413dc19da15762973f6905' '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' -'b595a1588bafb3d732841cd1b73633970706914f57f2d215c9f1494212d13989' '3e955e0f1aae96bb6c1507236adc952640c9bd0a134b9995ab92106a33dc02d9') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -49,11 +45,8 @@ cd "${srcdir}/${_srcname}" # add upstream patch - patch -p1 -i "${srcdir}/patch-${pkgver}" + #patch -p1 -i "${srcdir}/patch-${pkgver}" - # https://bugzilla.kernel.org/show_bug.cgi?id=189851 - patch -p1 -i "${srcdir}/net_handle_no_dst_on_skb_in_icmp6_send.patch" - # Revert a commit that causes memory corruption in i686 chroots on our # build server ("valgrind bash" immediately crashes) # https://bugzilla.kernel.org/show_bug.cgi?id=190061 Modified: config === --- config 2016-12-21 13:25:19 UTC (rev 284386) +++ config 2016-12-21 19:02:35 UTC (rev 284387) @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.8.0-1 Kernel Configuration +# Linux/x86 4.9.0-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -43,6 +43,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y # # General setup @@ -295,6 +296,7 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y # CONFIG_CPU_NO_EFFICIENT_FFS is not set +# CONFIG_HAVE_ARCH_VMAP_STACK is not set # # GCOV-based kernel profiling @@ -348,6 +350,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set # CONFIG_CMDLINE_PARTITION is not set +CONFIG_BLK_MQ_PCI=y # # IO Schedulers @@ -592,8 +595,6 @@ CONFIG_PM_ADVANCED_DEBUG=y # CONFIG_PM_TEST_SUSPEND is not set CONFIG_PM_SLEEP_DEBUG=y -CONFIG_DPM_WATCHDOG=y -CONFIG_DPM_WATCHDOG_TIMEOUT=60 CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y CONFIG_PM_CLK=y @@ -646,6 +647,7 @@ CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m CONFIG_DPTF_POWER=m +CONFIG_ACPI_WATCHDOG=y CONFIG_ACPI_EXTLOG=m # CONFIG_PMIC_OPREGION is not set CONFIG_ACPI_CONFIGFS=m @@ -677,7 +679,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=m
[arch-commits] Commit in linux/trunk (4 files)
Date: Thursday, November 17, 2016 @ 15:27:34 Author: heftig Revision: 280948 overhaul sed'ding Modified: linux/trunk/80-linux.hook linux/trunk/PKGBUILD linux/trunk/linux.install linux/trunk/linux.preset ---+ 80-linux.hook |6 +++--- PKGBUILD | 23 --- linux.install | 14 -- linux.preset |6 +++--- 4 files changed, 18 insertions(+), 31 deletions(-) Modified: 80-linux.hook === --- 80-linux.hook 2016-11-17 14:15:50 UTC (rev 280947) +++ 80-linux.hook 2016-11-17 15:27:34 UTC (rev 280948) @@ -2,10 +2,10 @@ Type = File Operation = Install Operation = Upgrade -Target = boot/vmlinuz-linux +Target = boot/vmlinuz-%PKGBASE% Target = usr/lib/initcpio/* [Action] -Description = Updating Arch Linux initramfs image +Description = Updating %PKGBASE% initcpios When = PostTransaction -Exec = /usr/bin/mkinitcpio -p linux +Exec = /usr/bin/mkinitcpio -p %PKGBASE% Modified: PKGBUILD === --- PKGBUILD2016-11-17 14:15:50 UTC (rev 280947) +++ PKGBUILD2016-11-17 15:27:34 UTC (rev 280948) @@ -31,8 +31,8 @@ 'SKIP' '2ac8818414beb7dbacbd3ad450c516e6ada804827132a7132f63b8189e5f5151' '93a4ad4f6c7bb9296fddec436ed7477a5a5c11cf4d6e68482fa6610442cbcb1f' -'2d4424928ae3c5f63ee618b4685580f4bd24faf1778553dbd961f85a88ea0910' -'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' +'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' +'a8cae3381e5669a70e20e36562d7433f61b13d24ad8c688cf6c398d5128e2c02' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -115,24 +115,17 @@ cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" # set correct depmod command for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \ +"${startdir}/${install}" > "${startdir}/${install}.pkg" true && install=${install}.pkg - sed \ --e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ --e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ --i "${startdir}/${install}" # install mkinitcpio preset file for kernel - install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - sed \ --e "1s|'linux.*'|'${pkgbase}'|" \ --e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ --e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \ --e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ --i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" | +install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" # install pacman hook for initramfs regeneration - install -D -m644 "${srcdir}/80-linux.hook" "${pkgdir}/usr/share/libalpm/hooks/80-linux.hook" + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/80-linux.hook" | +install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/80-${pkgbase}.hook" # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} Modified: linux.install === --- linux.install 2016-11-17 14:15:50 UTC (rev 280947) +++ linux.install 2016-11-17 15:27:34 UTC (rev 280948) @@ -1,13 +1,7 @@ -# arg 1: the new package version -# arg 2: the old package version - -KERNEL_NAME= -KERNEL_VERSION= - post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} + depmod %KERNVER% } post_upgrade() { @@ -17,7 +11,7 @@ # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod ${KERNEL_VERSION} + depmod %KERNVER% if [ $(vercmp $2 3.13) -lt 0 ]; then echo ">>> WARNING: AT keyboard support is no longer built into the kernel." @@ -28,6 +22,6 @@ post_remove() { # also remove the compat symlinks - rm -f boot/initramfs-linux${KERNEL_NAME}.img - rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img + rm -f boot/initramfs-%PKGBASE%.img + rm -f boot/initramfs-%PKGBASE%-fallback.img } Modified: linux.preset === --- linux.preset2016-11-17 14:15:50 UTC (rev 280947) +++ linux.preset2016-11-17 15:27:34 UTC (rev 280948) @@ -1,14 +1,14 @@ # mkinitcpio preset file for the 'linux' package ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-linux" +ALL_kver="/boot/vmlinuz-%PKGBASE%" PRESETS=('default' 'fallback') #default_config="/etc/mkinitcpio.conf"
[arch-commits] Commit in linux/trunk (4 files)
Date: Monday, February 1, 2016 @ 20:01:15 Author: tpowa Revision: 258752 upgpkg: linux 4.4.1-1 fix #47757 Added: linux/trunk/0001-4.4-revert-btrfs.patch linux/trunk/0001-4.4-revert-xfs.patch Modified: linux/trunk/PKGBUILD Deleted: linux/trunk/CVE-2016-0728.patch -+ 0001-4.4-revert-btrfs.patch | 78 ++ 0001-4.4-revert-xfs.patch | 39 + CVE-2016-0728.patch | 78 -- PKGBUILD| 12 +- 4 files changed, 127 insertions(+), 80 deletions(-) Added: 0001-4.4-revert-btrfs.patch === --- 0001-4.4-revert-btrfs.patch (rev 0) +++ 0001-4.4-revert-btrfs.patch 2016-02-01 19:01:15 UTC (rev 258752) @@ -0,0 +1,78 @@ +From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001 +From: David Sterba+Date: Mon, 25 Jan 2016 11:02:06 +0100 +Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()" + +This reverts commit 696249132158014d594896df3a81390616069c5c. The +cleaner thread can block freezing when there's a snapshot cleaning in +progress and the other threads get suspended first. From the logs +provided by Martin we're waiting for reading extent pages: + +kernel: PM: Syncing filesystems ... done. +kernel: Freezing user space processes ... (elapsed 0.015 seconds) done. +kernel: Freezing remaining freezable tasks ... +kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0): +kernel: btrfs-cleaner D 88033dd13bc0 0 152 2 0x +kernel: 88032ebc2e00 88032e75 88032e74fa50 7fff +kernel: 814a58df 0002 ea000934d580 814a5451 +kernel: 7fff 814a6e8f 0020 +kernel: Call Trace: +kernel: [] ? bit_wait+0x2c/0x2c +kernel: [] ? schedule+0x6f/0x7c +kernel: [] ? schedule_timeout+0x2f/0xd8 +kernel: [] ? timekeeping_get_ns+0xa/0x2e +kernel: [] ? ktime_get+0x36/0x44 +kernel: [] ? io_schedule_timeout+0x94/0xf2 +kernel: [] ? io_schedule_timeout+0x94/0xf2 +kernel: [] ? bit_wait_io+0x2c/0x30 +kernel: [] ? __wait_on_bit+0x41/0x73 +kernel: [] ? wait_on_page_bit+0x6d/0x72 +kernel: [] ? autoremove_wake_function+0x2a/0x2a +kernel: [] ? read_extent_buffer_pages+0x1bd/0x203 +kernel: [] ? free_root_pointers+0x4c/0x4c +kernel: [] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9 +kernel: [] ? read_tree_block+0x2d/0x45 +kernel: [] ? read_block_for_search.isra.34+0x22a/0x26b +kernel: [] ? btrfs_set_path_blocking+0x1e/0x4a +kernel: [] ? btrfs_search_slot+0x648/0x736 +kernel: [] ? btrfs_lookup_extent_info+0xb7/0x2c7 +kernel: [] ? walk_down_proc+0x9c/0x1ae +kernel: [] ? walk_down_tree+0x40/0xa4 +kernel: [] ? btrfs_drop_snapshot+0x2da/0x664 +kernel: [] ? finish_task_switch+0x126/0x167 +kernel: [] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0 +kernel: [] ? cleaner_kthread+0x13e/0x17b +kernel: [] ? btrfs_item_end+0x33/0x33 +kernel: [] ? kthread+0x95/0x9d +kernel: [] ? kthread_parkme+0x16/0x16 +kernel: [] ? ret_from_fork+0x3f/0x70 +kernel: [] ? kthread_parkme+0x16/0x16 + +As this affects a released kernel (4.4) we need a minimal fix for +stable kernels. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361 +Reported-by: Martin Ziegler +CC: sta...@vger.kernel.org # 4.4 +CC: Jiri Kosina +Signed-off-by: David Sterba +Signed-off-by: Chris Mason +--- + fs/btrfs/disk-io.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c +index 26ef141..404e894 100644 +--- a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c +@@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg) + int again; + struct btrfs_trans_handle *trans; + +- set_freezable(); + do { + again = 0; + +-- +cgit v0.12 + Added: 0001-4.4-revert-xfs.patch === --- 0001-4.4-revert-xfs.patch (rev 0) +++ 0001-4.4-revert-xfs.patch 2016-02-01 19:01:15 UTC (rev 258752) @@ -0,0 +1,39 @@ +From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001 +From: Dave Chinner +Date: Tue, 19 Jan 2016 08:21:46 +1100 +Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread" + +This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it +prevents machines from suspending. This regression occurs when the +xfsaild is idle on entry to suspend, and so there s no activity to +wake it from it's idle sleep and hence see that it is supposed to +freeze. Hence the freezer times out waiting for it and suspend is +cancelled. + +There is no obvious fix for this short of freezing the filesystem +properly, so revert this change for now. + +cc: # 4.4
[arch-commits] Commit in linux/trunk (4 files)
Date: Wednesday, January 13, 2016 @ 20:52:26 Author: tpowa Revision: 258178 upgpkg: linux 4.4-1 bump to 4.4 release Modified: linux/trunk/PKGBUILD linux/trunk/config linux/trunk/config.x86_64 Deleted: linux/trunk/0001-disabling-primary-plane-in-the-noatomic-case.patch -+ 0001-disabling-primary-plane-in-the-noatomic-case.patch | 56 PKGBUILD| 10 config | 165 +++--- config.x86_64 | 163 +++-- 4 files changed, 262 insertions(+), 132 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 258177:258178 to see the changes.
[arch-commits] Commit in linux/trunk (4 files)
Date: Sunday, December 7, 2014 @ 10:22:03 Author: thomas Revision: 227341 linux: Use proper patches from git instead of manually modifying them. Added: linux/trunk/0001-x86-microcode-Update-BSPs-microcode-on-resume.patch linux/trunk/0002-x86-microcode-Limit-the-microcode-reloading-to-64-bi.patch Modified: linux/trunk/PKGBUILD Deleted: linux/trunk/fix_CPU0_microcode_on_resume.patch -+ 0001-x86-microcode-Update-BSPs-microcode-on-resume.patch| 48 + 0002-x86-microcode-Limit-the-microcode-reloading-to-64-bi.patch | 55 + PKGBUILD| 10 - fix_CPU0_microcode_on_resume.patch | 92 -- 4 files changed, 110 insertions(+), 95 deletions(-) Added: 0001-x86-microcode-Update-BSPs-microcode-on-resume.patch === --- 0001-x86-microcode-Update-BSPs-microcode-on-resume.patch (rev 0) +++ 0001-x86-microcode-Update-BSPs-microcode-on-resume.patch2014-12-07 09:22:03 UTC (rev 227341) @@ -0,0 +1,48 @@ +From fb86b97300d930b57471068720c52bfa8622eab7 Mon Sep 17 00:00:00 2001 +From: Borislav Petkov b...@suse.de +Date: Tue, 18 Nov 2014 10:46:57 +0100 +Subject: [PATCH] x86, microcode: Update BSPs microcode on resume +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In the situation when we apply early microcode but do *not* apply late +microcode, we fail to update the BSP's microcode on resume because we +haven't initialized the uci-mc microcode pointer. So, in order to +alleviate that, we go and dig out the stashed microcode patch during +early boot. It is basically the same thing that is done on the APs early +during boot so do that too here. + +Tested-by: alex.schna...@gmail.com +Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=88001 +Cc: Henrique de Moraes Holschuh h...@hmh.eng.br +Cc: Fenghua Yu fenghua...@intel.com +Cc: sta...@vger.kernel.org # v3.9 +Signed-off-by: Borislav Petkov b...@suse.de +Link: http://lkml.kernel.org/r/20141118094657.ga6...@pd.tnic +Signed-off-by: Thomas Gleixner t...@linutronix.de +--- + arch/x86/kernel/cpu/microcode/core.c | 8 + 1 file changed, 8 insertions(+) + +diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c +index dd9d619..2ce9051 100644 +--- a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c +@@ -465,6 +465,14 @@ static void mc_bp_resume(void) + + if (uci-valid uci-mc) + microcode_ops-apply_microcode(cpu); ++ else if (!uci-mc) ++ /* ++ * We might resume and not have applied late microcode but still ++ * have a newer patch stashed from the early loader. We don't ++ * have it in uci-mc so we have to load it the same way we're ++ * applying patches early on the APs. ++ */ ++ load_ucode_ap(); + } + + static struct syscore_ops mc_syscore_ops = { +-- +2.1.3 + Added: 0002-x86-microcode-Limit-the-microcode-reloading-to-64-bi.patch === --- 0002-x86-microcode-Limit-the-microcode-reloading-to-64-bi.patch (rev 0) +++ 0002-x86-microcode-Limit-the-microcode-reloading-to-64-bi.patch 2014-12-07 09:22:03 UTC (rev 227341) @@ -0,0 +1,55 @@ +From 02ecc41abcea4ff9291d548f6f846b29b354ddd2 Mon Sep 17 00:00:00 2001 +From: Borislav Petkov b...@suse.de +Date: Sun, 30 Nov 2014 14:26:39 +0100 +Subject: [PATCH] x86, microcode: Limit the microcode reloading to 64-bit for + now +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +First, there was this: https://bugzilla.kernel.org/show_bug.cgi?id=88001 + +The problem there was that microcode patches are not being reapplied +after suspend-to-ram. It was important to reapply them, though, because +of for example Haswell's TSX erratum which disabled TSX instructions +with a microcode patch. + +A simple fix was fb86b97300d9 (x86, microcode: Update BSPs microcode +on resume) but, as it is often the case, simple fixes are too +simple. This one causes 32-bit resume to fail: + +https://bugzilla.kernel.org/show_bug.cgi?id=88391 + +Properly fixing this would require more involved changes for which it +is too late now, right before the merge window. Thus, limit this to +64-bit only temporarily. + +Signed-off-by: Borislav Petkov b...@suse.de +Link: http://lkml.kernel.org/r/1417353999-32236-1-git-send-email...@alien8.de +Signed-off-by: Thomas Gleixner t...@linutronix.de +--- + arch/x86/kernel/cpu/microcode/core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c +index 2ce9051..08fe6e8 100644 +--- a/arch/x86/kernel/cpu/microcode/core.c
[arch-commits] Commit in linux/trunk (4 files)
Date: Thursday, March 21, 2013 @ 08:26:50 Author: tpowa Revision: 180406 upgpkg: linux 3.8.4-1 bump to latest version Modified: linux/trunk/PKGBUILD linux/trunk/linux.install Deleted: linux/trunk/drm-i915-enable-irqs-earlier-when-resuming.patch linux/trunk/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch -+ PKGBUILD| 19 - drm-i915-enable-irqs-earlier-when-resuming.patch| 82 -- drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch | 124 -- linux.install |2 4 files changed, 6 insertions(+), 221 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-21 02:05:09 UTC (rev 180405) +++ PKGBUILD2013-03-21 07:26:50 UTC (rev 180406) @@ -5,8 +5,8 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.8 -pkgver=3.8.3 -pkgrel=2 +pkgver=3.8.4 +pkgrel=1 arch=('i686' 'x86_64') url=http://www.kernel.org/; license=('GPL2') @@ -18,17 +18,13 @@ 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' -'change-default-console-loglevel.patch' -'drm-i915-enable-irqs-earlier-when-resuming.patch' -'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch') +'change-default-console-loglevel.patch') md5sums=('1c738edfc54e7c65faeb90c436104e2f' - 'ba18b5d27ed303f5e5a9cda32a451031' + '40ab82996ff4b49ad3f4e19cf729dcab' '307107a8b15060e6fc0e48bdaacaed06' '03b1dad90f3558dba3031901398c1ca4' 'eb14dcfd80c00852ef81ded6e826826a' - 'f3def2cefdcbb954c21d8505d23cc83c' - '40e7b328977ad787a0b5584f193d63fe' - '8b9159931fab0c191a86dbd5a46fa328') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux} @@ -46,11 +42,6 @@ # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i ${srcdir}/change-default-console-loglevel.patch - # revert 2 patches which breaks displays - # FS 34327 - patch -Rp1 -i ${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch - patch -Rp1 -i ${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch - if [ ${CARCH} = x86_64 ]; then cat ${srcdir}/config.x86_64 ./.config else Deleted: drm-i915-enable-irqs-earlier-when-resuming.patch === --- drm-i915-enable-irqs-earlier-when-resuming.patch2013-03-21 02:05:09 UTC (rev 180405) +++ drm-i915-enable-irqs-earlier-when-resuming.patch2013-03-21 07:26:50 UTC (rev 180406) @@ -1,82 +0,0 @@ -From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter daniel.vet...@ffwll.ch -Date: Tue, 5 Mar 2013 09:50:58 +0100 -Subject: drm/i915: enable irqs earlier when resuming - -From: Daniel Vetter daniel.vet...@ffwll.ch - -commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. - -We need it to restore the ilk rc6 context, since the gpu wait no -requires interrupts. But in general having interrupts around should -help in code sanity, since more and more stuff is interrupt driven. - -This regression has been introduced in - -commit 3e9605018ab3e333d51cc90fccfde2031886763b -Author: Chris Wilson ch...@chris-wilson.co.uk -Date: Tue Nov 27 16:22:54 2012 + - -drm/i915: Rearrange code to only have a single method for waiting upon the ring - -Like in the driver load code we need to make sure that hotplug -interrupts don't cause havoc with our modeset state, hence block them -with the existing infrastructure. Again we ignore races where we might -loose hotplug interrupts ... - -Note that the driver load part of the regression has already been -fixed in - -commit 52d7ecedac3f96fb562cb482c139015372728638 -Author: Daniel Vetter daniel.vet...@ffwll.ch -Date: Sat Dec 1 21:03:22 2012 +0100 - -drm/i915: reorder setup sequence to have irqs for output setup - -v2: Add a note to the commit message about which patch fixed the -driver load part of the regression. Stable kernels need to backport -both patches. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 -Cc: Chris Wilson ch...@chris-wilson.co.uk -Cc: Mika Kuoppala mika.kuopp...@intel.com -Reported-and-Tested-by: Ilya Tumaykin itumay...@gmail.com -Reviewed-by: Chris wilson ch...@chris-wilson.co.uk (v1) -Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch -Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org - - drivers/gpu/drm/i915/i915_drv.c | 13 - - 1 file changed, 12 insertions(+), 1 deletion(-) - a/drivers/gpu/drm/i915/i915_drv.c -+++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -486,6 +486,7 @@ static
[arch-commits] Commit in linux/trunk (4 files)
Date: Sunday, March 17, 2013 @ 14:00:07 Author: tpowa Revision: 180114 upgpkg: linux 3.8.3-2 fix intel drm #34327 Added: linux/trunk/drm-i915-enable-irqs-earlier-when-resuming.patch linux/trunk/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch Modified: linux/trunk/PKGBUILD linux/trunk/linux.install -+ PKGBUILD| 15 - drm-i915-enable-irqs-earlier-when-resuming.patch| 82 ++ drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch | 124 ++ linux.install |2 4 files changed, 219 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-17 11:48:21 UTC (rev 180113) +++ PKGBUILD2013-03-17 13:00:07 UTC (rev 180114) @@ -6,7 +6,7 @@ #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.8 pkgver=3.8.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url=http://www.kernel.org/; license=('GPL2') @@ -18,13 +18,17 @@ 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' -'change-default-console-loglevel.patch') +'change-default-console-loglevel.patch' +'drm-i915-enable-irqs-earlier-when-resuming.patch' +'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch') md5sums=('1c738edfc54e7c65faeb90c436104e2f' 'ba18b5d27ed303f5e5a9cda32a451031' '307107a8b15060e6fc0e48bdaacaed06' '03b1dad90f3558dba3031901398c1ca4' 'eb14dcfd80c00852ef81ded6e826826a' - 'f3def2cefdcbb954c21d8505d23cc83c') + 'f3def2cefdcbb954c21d8505d23cc83c' + '40e7b328977ad787a0b5584f193d63fe' + '8b9159931fab0c191a86dbd5a46fa328') _kernelname=${pkgbase#linux} @@ -42,6 +46,11 @@ # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i ${srcdir}/change-default-console-loglevel.patch + # revert 2 patches which breaks displays + # FS 34327 + patch -Rp1 -i ${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch + patch -Rp1 -i ${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch + if [ ${CARCH} = x86_64 ]; then cat ${srcdir}/config.x86_64 ./.config else Added: drm-i915-enable-irqs-earlier-when-resuming.patch === --- drm-i915-enable-irqs-earlier-when-resuming.patch (rev 0) +++ drm-i915-enable-irqs-earlier-when-resuming.patch2013-03-17 13:00:07 UTC (rev 180114) @@ -0,0 +1,82 @@ +From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 +From: Daniel Vetter daniel.vet...@ffwll.ch +Date: Tue, 5 Mar 2013 09:50:58 +0100 +Subject: drm/i915: enable irqs earlier when resuming + +From: Daniel Vetter daniel.vet...@ffwll.ch + +commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. + +We need it to restore the ilk rc6 context, since the gpu wait no +requires interrupts. But in general having interrupts around should +help in code sanity, since more and more stuff is interrupt driven. + +This regression has been introduced in + +commit 3e9605018ab3e333d51cc90fccfde2031886763b +Author: Chris Wilson ch...@chris-wilson.co.uk +Date: Tue Nov 27 16:22:54 2012 + + +drm/i915: Rearrange code to only have a single method for waiting upon the ring + +Like in the driver load code we need to make sure that hotplug +interrupts don't cause havoc with our modeset state, hence block them +with the existing infrastructure. Again we ignore races where we might +loose hotplug interrupts ... + +Note that the driver load part of the regression has already been +fixed in + +commit 52d7ecedac3f96fb562cb482c139015372728638 +Author: Daniel Vetter daniel.vet...@ffwll.ch +Date: Sat Dec 1 21:03:22 2012 +0100 + +drm/i915: reorder setup sequence to have irqs for output setup + +v2: Add a note to the commit message about which patch fixed the +driver load part of the regression. Stable kernels need to backport +both patches. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 +Cc: Chris Wilson ch...@chris-wilson.co.uk +Cc: Mika Kuoppala mika.kuopp...@intel.com +Reported-and-Tested-by: Ilya Tumaykin itumay...@gmail.com +Reviewed-by: Chris wilson ch...@chris-wilson.co.uk (v1) +Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch +Signed-off-by: Greg Kroah-Hartman gre...@linuxfoundation.org + +--- + drivers/gpu/drm/i915/i915_drv.c | 13 - + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c +@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de + intel_modeset_disable(dev); + + drm_irq_uninstall(dev); ++
[arch-commits] Commit in linux/trunk (4 files)
Date: Thursday, February 28, 2013 @ 19:41:03 Author: tpowa Revision: 178913 upgpkg: linux 3.8.1-1 bump to latest version Modified: linux/trunk/PKGBUILD linux/trunk/linux.install Deleted: linux/trunk/CVE-2013-1763.patch linux/trunk/fat-3.6.x.patch -+ CVE-2013-1763.patch | 35 --- PKGBUILD| 27 +++ fat-3.6.x.patch | 33 - linux.install |2 +- 4 files changed, 12 insertions(+), 85 deletions(-) Deleted: CVE-2013-1763.patch === --- CVE-2013-1763.patch 2013-02-28 18:37:56 UTC (rev 178912) +++ CVE-2013-1763.patch 2013-02-28 18:41:03 UTC (rev 178913) @@ -1,35 +0,0 @@ -From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001 -From: Mathias Krause mini...@googlemail.com -Date: Sat, 23 Feb 2013 01:13:47 + -Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[] - -Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY -with a family greater or equal then AF_MAX -- the array size of -sock_diag_handlers[]. The current code does not test for this -condition therefore is vulnerable to an out-of-bound access opening -doors for a privilege escalation. - -Signed-off-by: Mathias Krause mini...@googlemail.com -Acked-by: Eric Dumazet eduma...@google.com -Signed-off-by: David S. Miller da...@davemloft.net - net/core/sock_diag.c |3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c -index 602cd63..750f44f 100644 a/net/core/sock_diag.c -+++ b/net/core/sock_diag.c -@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - if (nlmsg_len(nlh) sizeof(*req)) - return -EINVAL; - -+ if (req-sdiag_family = AF_MAX) -+ return -EINVAL; -+ - hndl = sock_diag_lock_handler(req-sdiag_family); - if (hndl == NULL) - err = -ENOENT; --- -1.7.6.5 - Modified: PKGBUILD === --- PKGBUILD2013-02-28 18:37:56 UTC (rev 178912) +++ PKGBUILD2013-02-28 18:41:03 UTC (rev 178913) @@ -5,27 +5,20 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.8 -pkgver=3.8 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 arch=('i686' 'x86_64') url=http://www.kernel.org/; license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=(http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz; -#http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz; +http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz; # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' -'change-default-console-loglevel.patch' -'CVE-2013-1763.patch') -md5sums=('1c738edfc54e7c65faeb90c436104e2f' - '9710fb1b1e08eb1fc5214dc2fb34ebcc' - '03b1dad90f3558dba3031901398c1ca4' - 'eb14dcfd80c00852ef81ded6e826826a' - '9d3c56a4b999c8bfbd4018089a62f662' - '420991808fe4cba143013427c0737aa9') +'change-default-console-loglevel.patch') _kernelname=${pkgbase#linux} @@ -33,15 +26,11 @@ cd ${srcdir}/${_srcname} # add upstream patch - # patch -p1 -i ${srcdir}/patch-${pkgver} + patch -p1 -i ${srcdir}/patch-${pkgver} # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # Fix security vulnetability CVE-2013-1763.patch - # https://bugs.archlinux.org/task/34005 - patch -Np1 -i ${srcdir}/CVE-2013-1763.patch - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -321,3 +310,9 @@ done # vim:set ts=8 sts=2 sw=2 et: +md5sums=('1c738edfc54e7c65faeb90c436104e2f' + '50a68679086c346dddb34dedccfae7ee' + '307107a8b15060e6fc0e48bdaacaed06' + '03b1dad90f3558dba3031901398c1ca4' + 'eb14dcfd80c00852ef81ded6e826826a' + '9d3c56a4b999c8bfbd4018089a62f662') Deleted: fat-3.6.x.patch === --- fat-3.6.x.patch 2013-02-28 18:37:56 UTC (rev 178912) +++ fat-3.6.x.patch 2013-02-28 18:41:03 UTC (rev 178913) @@ -1,33 +0,0 @@ -From: Dave Reisner dreis...@archlinux.org -Date: Thu, 29 Nov 2012 03:18:52 + (+1100) -Subject: fs/fat: strip cp prefix from codepage in display -X-Git-Tag: next-20121130~1^2~97 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 - -fs/fat: strip cp prefix
[arch-commits] Commit in linux/trunk (4 files)
Date: Sunday, June 24, 2012 @ 13:48:49 Author: tpowa Revision: 162269 upgpkg: linux 3.4.4-2 fix backlight and nouveau Added: linux/trunk/3.4.4-fix-backlight-regression.patch linux/trunk/3.4.4-fix-gtx560ti-nouveau-regression.patch Modified: linux/trunk/PKGBUILD linux/trunk/linux.install -+ 3.4.4-fix-backlight-regression.patch| 38 ++ 3.4.4-fix-gtx560ti-nouveau-regression.patch | 20 + PKGBUILD| 18 ++-- linux.install |2 - 4 files changed, 74 insertions(+), 4 deletions(-) Added: 3.4.4-fix-backlight-regression.patch === --- 3.4.4-fix-backlight-regression.patch(rev 0) +++ 3.4.4-fix-backlight-regression.patch2012-06-24 17:48:49 UTC (rev 162269) @@ -0,0 +1,38 @@ +Subject: Still use ACPI backlight control if _DOS doesn't exist + +This is a regression introduced by commit +ea9f8856bd6d4ed45885b06a338f7362cd6c60e5 + +https://bugzilla.kernel.org/show_bug.cgi?id=43168 + +Some platforms don't have _DOS control method, but the ACPI +backlight still works. +We do not want to lose the backlight control ability on these platforms. + +CC : Igor Murzov intergalactic.anonym...@gmail.com +Signed-off-by: Zhang Rui rui.zh...@intel.com +--- + drivers/acpi/video.c | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +Index: rtd3/drivers/acpi/video.c +=== +--- rtd3.orig/drivers/acpi/video.c rtd3/drivers/acpi/video.c +@@ -565,8 +565,14 @@ acpi_video_bus_DOS(struct acpi_video_bus + video-dos_setting = arg0.integer.value; + status = acpi_evaluate_object(video-device-handle, _DOS, + args, NULL); +- if (ACPI_FAILURE(status)) +- return -EIO; ++ if (ACPI_FAILURE(status)) { ++ /* ++ * some platforms don't have _DOS, but the ACPI ++ * backlight control still works ++ */ ++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, No _DOS\n)); ++ return 0; ++ } + + return 0; + } Added: 3.4.4-fix-gtx560ti-nouveau-regression.patch === --- 3.4.4-fix-gtx560ti-nouveau-regression.patch (rev 0) +++ 3.4.4-fix-gtx560ti-nouveau-regression.patch 2012-06-24 17:48:49 UTC (rev 162269) @@ -0,0 +1,20 @@ +Revert change to include/drm/drm_fb_helper.h made in commit 4f988d132d2668b4f3b42bfc70daa531115ccca1 + + include/drm/drm_fb_helper.h |1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h +index 55e10d6..5120b01 100644 +--- a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h +@@ -35,6 +35,7 @@ struct drm_fb_helper; + #include linux/kgdb.h + + struct drm_fb_helper_crtc { ++ uint32_t crtc_id; + struct drm_mode_set mode_set; + struct drm_display_mode *desired_mode; + }; +-- +1.7.6.5 + Modified: PKGBUILD === --- PKGBUILD2012-06-24 17:39:02 UTC (rev 162268) +++ PKGBUILD2012-06-24 17:48:49 UTC (rev 162269) @@ -8,7 +8,7 @@ _kernelname=${pkgname#linux} _basekernel=3.4 pkgver=${_basekernel}.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url=http://www.kernel.org/; license=('GPL2') @@ -22,7 +22,9 @@ ${pkgname}.preset 'fix-acerhdf-1810T-bios.patch' 'change-default-console-loglevel.patch' -'i915-fix-ghost-tv-output.patch') +'i915-fix-ghost-tv-output.patch' +'3.4.4-fix-backlight-regression.patch' +'3.4.4-fix-gtx560ti-nouveau-regression.patch') md5sums=('967f72983655e2479f951195953e8480' '58e6672d932d74d5e2b6811b9d37d67c' '3f2c307c8ffae67f60c13ef69af8364a' @@ -30,7 +32,9 @@ 'eb14dcfd80c00852ef81ded6e826826a' '38c1fd4a1f303f1f6c38e7f082727e2f' '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5') + '263725f20c0b9eb9c353040792d644e5' + '80a46681386bb87813989faeb92bdd9a' + '827ffd855dc8b0c91577545c5804c19f') build() { cd ${srcdir}/linux-${_basekernel} @@ -50,6 +54,14 @@ # needed. patch -Np1 -i ${srcdir}/i915-fix-ghost-tv-output.patch + # Fix backlight control on some laptops: + # https://bugzilla.kernel.org/show_bug.cgi?id=43168 + patch -Np1 -i ${srcdir}/3.4.4-fix-backlight-regression.patch + + # fix nouveau regression + # Arch Linux bug report: FS#30417 + patch -Np1 -i ${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch + # Patch submitted upstream, waiting for inclusion: # https://lkml.org/lkml/2012/2/19/51 # add support for latest bios of Acer 1810T acerhdf module Modified: linux.install