summaryrefslogtreecommitdiffstats
path: root/scripts/combine.sh
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-05 10:03:27 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-05 10:03:27 -0600
commit3422e04a2e31dba3e17af206f160d4fc409f4250 (patch)
treeef03b0b60e236af96331d0ddb83208bb40bcf9f0 /scripts/combine.sh
parent7a64d107da5cd0ea8bad9200ebcd37146324361f (diff)
downloadkernel-3422e04a2e31dba3e17af206f160d4fc409f4250.tar.gz
kernel-3422e04a2e31dba3e17af206f160d4fc409f4250.tar.xz
kernel-3422e04a2e31dba3e17af206f160d4fc409f4250.zip
kernel-5.11.3-50
* Fri Mar 05 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.3-50] - PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar) - Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson) - forgot to push this one earlier (Justin M. Forbes) - Reference the patch as version.patchlevel to more easily see diffs between stable releases (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'scripts/combine.sh')
-rwxr-xr-xscripts/combine.sh34
1 files changed, 0 insertions, 34 deletions
diff --git a/scripts/combine.sh b/scripts/combine.sh
deleted file mode 100755
index 86a68d302..000000000
--- a/scripts/combine.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-
-# combine a set of quilt patches
-
-# $1 : base dir (source tree)
-# $2 : quilt dir (patches to apply)
-# $3 : pre-patch to apply first (optional)
-
-# e.g.:
-# combine.sh /home/user/fedora/trunk/kernel/F-11/kernel-2.6.30/vanilla-2.6.30 \
-# /home/user/git/stable-queue/queue-2.6.30 \
-# /home/user/fedora/trunk/kernel/F-11/patch-2.6.30.5.bz2
-
-if [ $# -lt 2 ] ; then
- exit 1
-fi
-
-TD="combine_temp.d"
-
-cd $1 || exit 1
-cd ..
-[ -d $TD ] && rm -Rf $TD
-mkdir $TD || exit 1
-cd $TD
-
-cp -al ../$(basename $1) work.d
-cd work.d
-[ "$3" ] && bzcat $3 | patch -p1 -s
-ln -s $2 patches
-[ -h patches ] || exit 1
-quilt snapshot
-quilt upgrade
-quilt push -a -q
-quilt diff --snapshot >../combined.patch