summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-01-07 15:37:16 -0600
committerJustin M. Forbes <jforbes@redhat.com>2013-01-07 15:37:16 -0600
commitc011f81972f4431b119c2cda8070a49484ae66db (patch)
tree11ee08afaceeefbe1b57e526e3a56dd69efa330d
parent21c1d87aab9bb786dc20c46f46a50368b99431aa (diff)
downloadkernel-c011f81972f4431b119c2cda8070a49484ae66db.tar.gz
kernel-c011f81972f4431b119c2cda8070a49484ae66db.tar.xz
kernel-c011f81972f4431b119c2cda8070a49484ae66db.zip
remove the namei-include.patch, it's upstream now
-rw-r--r--kernel.spec5
-rw-r--r--namei-include.patch11
2 files changed, 1 insertions, 15 deletions
diff --git a/kernel.spec b/kernel.spec
index 8778a87ce..a6bae710e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -725,9 +725,6 @@ Patch21003: arm-omapdrm-fixinc.patch
Patch21004: arm-tegra-nvec-kconfig.patch
Patch21005: arm-tegra-usb-no-reset-linux33.patch
-# https://patchwork.kernel.org/patch/1909111/
-Patch21010: namei-include.patch
-
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1311,7 +1308,6 @@ ApplyPatch arm-allnoconfig-error-__LINUX_ARM_ARCH__-undeclared.patch
ApplyPatch arm-omapdrm-fixinc.patch
# ApplyPatch arm-tegra-nvec-kconfig.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
-ApplyPatch namei-include.patch
#
# bugfixes to drivers and filesystems
@@ -2301,6 +2297,7 @@ fi
%changelog
* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git2.1
- Linux v3.8-rc2-191-gd287b87
+- remove the namei-include.patch, it's upstream now
* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git1.2
- Reenable debugging options.
diff --git a/namei-include.patch b/namei-include.patch
deleted file mode 100644
index dd6363e89..000000000
--- a/namei-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index e998c03..5a5ff57 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -2,6 +2,7 @@
- #define _LINUX_NAMEI_H
-
- #include <linux/dcache.h>
-+#include <linux/errno.h>
- #include <linux/linkage.h>
- #include <linux/path.h>