diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-sdhci-revert.patch | 25 | ||||
| -rw-r--r-- | Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch | 36 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
4 files changed, 9 insertions, 77 deletions
@@ -1,7 +1,7 @@ # Generated by makepkg 5.0.1 -# Wed Sep 21 11:45:13 UTC 2016 +# Thu Sep 22 16:59:23 UTC 2016 pkgbase = linux-rt-lts - pkgver = 4.4.21_rt29 + pkgver = 4.4.21_rt30 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -17,14 +17,13 @@ pkgbase = linux-rt-lts source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.sign source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.21.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.21.sign - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.21-rt29.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.21-rt29.patch.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.21-rt30.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.21-rt30.patch.sign source = config source = config.x86_64 source = linux-rt-lts.preset source = change-default-console-loglevel.patch source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch - source = Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch source = 0001-fix-dcache-try-1.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E @@ -35,14 +34,13 @@ pkgbase = linux-rt-lts sha256sums = SKIP sha256sums = 278c4ea17ef539e81cb597f0e7e84750649d0f7fddcb27d99abfcb46da9db737 sha256sums = SKIP - sha256sums = 3ad4a934d154cc352a67957908cf9135ba64ec5721dd10d67018fce1c240fe68 + sha256sums = d5d0b6e991a4436d7e0e02f32e7f8580555be6d0d8886d1205aa841b89781a13 sha256sums = SKIP sha256sums = 1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191 sha256sums = b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3 sha256sums = a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 - sha256sums = 9f66f554bfae117d45d7c73db136dd1d46fd7364962aa7fd2324ba9f1c85ba3f sha256sums = 8b96ecc7c4c1dc5fc81162d010d69606b590f0feee0563aee875706e0ab4d5f9 pkgname = linux-rt-lts diff --git a/0001-sdhci-revert.patch b/0001-sdhci-revert.patch deleted file mode 100644 index 5d4afd6..0000000 --- a/0001-sdhci-revert.patch +++ /dev/null @@ -1,25 +0,0 @@ -index 2cadf08..b48565e 100644 ---- a/drivers/mmc/host/sdhci.c -+++ b/drivers/mmc/host/sdhci.c -@@ -1895,9 +1895,9 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) - tuning_count = host->tuning_count; - - /* -- * The Host Controller needs tuning only in case of SDR104 mode -- * and for SDR50 mode when Use Tuning for SDR50 is set in the -- * Capabilities register. -+ * The Host Controller needs tuning in case of SDR104 and DDR50 -+ * mode, and for SDR50 mode when Use Tuning for SDR50 is set in -+ * the Capabilities register. - * If the Host Controller supports the HS200 mode then the - * tuning function has to be executed. - */ -@@ -1917,6 +1917,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) - break; - - case MMC_TIMING_UHS_SDR104: -+ case MMC_TIMING_UHS_DDR50: - break; - - case MMC_TIMING_UHS_SDR50: -generated by cgit v0.11.2 at 2016-01-01 22:11:38 (GMT) diff --git a/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch b/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch deleted file mode 100644 index e99aeb5..0000000 --- a/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch +++ /dev/null @@ -1,36 +0,0 @@ -From Juerg Haefliger <> -Subject [PATCH] hyperv: Fix compilation issue with 4.4.19-rt27 -Date Thu, 1 Sep 2016 10:57:14 +0200 - -Fix a compilation issue introduced by upstream commit 4b44f2d18a330565227a7348844493c59366171e - -The upstream commit exports the symbol add_interrupt_randomness() -which is now being used in the Hyper-V driver. The RT patch adds another -argument to that function so its usage in the Hyper-V driver needs to -be fixed. - -This patch should be merged with: -patches/0216-random-Make-it-work-on-rt.patch -commit 20985550b01a21ba00a587d17d7c26da61e01acc random: Make it work on rt - -Signed-off-by: Juerg Haefliger <juerg.haefliger@hpe.com> -Reviewed-by: T Makphaibulchoke <tmac@hpe.com> ---- -drivers/hv/vmbus_drv.c | 2 +- -1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c -index 9b5440f6b3b4..c9c4899834f2 100644 ---- a/drivers/hv/vmbus_drv.c -+++ b/drivers/hv/vmbus_drv.c -@@ -828,7 +828,7 @@ static void vmbus_isr(void) - tasklet_schedule(&msg_dpc); - } - -- add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0); -+ add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0, 0); - } - - --- -2.9.3 - @@ -8,7 +8,7 @@ pkgbase=linux-rt-lts # Build kernel with a different name _srcname=linux-4.4 _pkgver=4.4.21 -_rtpatchver=rt29 +_rtpatchver=rt30 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64') @@ -20,29 +20,27 @@ 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/projects/rt/4.4/patch-${_pkgver}-${_rtpatchver}.patch.xz" - "https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-${_pkgver}-${_rtpatchver}.patch.sign" + "https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-${_pkgver}-${_rtpatchver}.patch.xz" + "https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-${_pkgver}-${_rtpatchver}.patch.sign" # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'change-default-console-loglevel.patch' 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch' - 'Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch' '0001-fix-dcache-try-1.patch') sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' '278c4ea17ef539e81cb597f0e7e84750649d0f7fddcb27d99abfcb46da9db737' 'SKIP' - '3ad4a934d154cc352a67957908cf9135ba64ec5721dd10d67018fce1c240fe68' + 'd5d0b6e991a4436d7e0e02f32e7f8580555be6d0d8886d1205aa841b89781a13' 'SKIP' '1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191' 'b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3' 'a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06' - '9f66f554bfae117d45d7c73db136dd1d46fd7364962aa7fd2324ba9f1c85ba3f' '8b96ecc7c4c1dc5fc81162d010d69606b590f0feee0563aee875706e0ab4d5f9') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -67,9 +65,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - #msg "Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch" - patch -p1 -i "${srcdir}/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch" - msg "0001-fix-dcache-try-1.patch" patch -p1 -i "${srcdir}/0001-fix-dcache-try-1.patch" |