delete obsolete patches

diff --git a/Makefile b/Makefile
index cdb6c52cf1899b2820c0f84ca60b0eb1fbc6e9f6..6a26e8a59689a8ad73d7203bbc259f7d3abf2be3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -236,8 +236,6 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        #cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
        cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
        #cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
-       cd ${KERNEL_SRC}; patch -p1 <../apparmor-fix-bad--include-path.patch
-       cd ${KERNEL_SRC}; patch -p1 <../ntp-Fix-ADJ_SETOFFSET-being-used-w-ADJ_NANO.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 

diff --git a/apparmor-fix-bad--include-path.patch b/apparmor-fix-bad--include-path.patch
deleted file mode 100644 (file)
index 0a96017..0000000
--- a/apparmor-fix-bad--include-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c2748a7ca2cc647ba8859aa0653c496cacac44f Mon Sep 17 00:00:00 2001
-From: Tyler Hicks <tyhicks@canonical.com>
-Date: Tue, 5 Apr 2016 12:35:23 -0500
-Subject: UBUNTU: SAUCE: apparmor: Fix FTBFS due to bad include path
-
-When header files in security/apparmor/includes/ pull in other header
-files in that directory, they should only include the file name. This
-fixes a build failure reported by Tycho when using `make bindeb-pkg` to
-build the Ubuntu kernel tree but, confusingly, isn't seen when building
-with `fakeroot debian/rules binary-generic`.
-
-Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
-Reported-by: Tycho Andersen <tycho.andersen@canonical.com>
-Cc: John Johansen <john.johansen@canonical.com>
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-
-diff --git a/security/apparmor/include/domain.h b/security/apparmor/include/domain.h
-index 89cfa75..b589655 100644
---- a/security/apparmor/include/domain.h
-+++ b/security/apparmor/include/domain.h
-@@ -15,7 +15,7 @@
- #include <linux/binfmts.h>
- #include <linux/types.h>
- 
--#include "include/label.h"
-+#include "label.h"
- 
- #ifndef __AA_DOMAIN_H
- #define __AA_DOMAIN_H
--- 
-cgit v0.10.2
-

diff --git a/changelog.Debian b/changelog.Debian
index 8bcac8395538e5e2b7ab24f5250d199dec89b771..22f875031e5a2a3703a8a6f49826b17f06e99b4e 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -4,6 +4,10 @@ pve-kernel (4.4.6-46) unstable; urgency=medium
 
   * update DRBD to 9.0.2-1
 
+  * delete apparmor-fix-bad--include-path.patch (upstream)
+
+  * detete ntp-Fix-ADJ_SETOFFSET-being-used-w-ADJ_NANO.patch (upstream)
+
  -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Apr 2016 06:19:02 +0200
 
 pve-kernel (4.4.6-45) unstable; urgency=medium

diff --git a/ntp-Fix-ADJ_SETOFFSET-being-used-w-ADJ_NANO.patch b/ntp-Fix-ADJ_SETOFFSET-being-used-w-ADJ_NANO.patch
deleted file mode 100644 (file)
index 6ee4abe..0000000
--- a/ntp-Fix-ADJ_SETOFFSET-being-used-w-ADJ_NANO.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: John Stultz <john.stultz@linaro.org>
-
-BugLink: http://bugs.launchpad.net/bugs/1566465
-
-Recently, in commit 37cf4dc3370f I forgot to check if the timeval being passed
-was actually a timespec (as is signaled with ADJ_NANO).
-
-This resulted in that patch breaking ADJ_SETOFFSET users who set
-ADJ_NANO, by rejecting valid timespecs that were compared with
-valid timeval ranges.
-
-This patch addresses this by checking for the ADJ_NANO flag and
-using the timepsec check instead in that case.
-
-Reported-by: Harald Hoyer <harald@redhat.com>
-Reported-by: Kay Sievers <kay@vrfy.org>
-Fixes: 37cf4dc3370f "time: Verify time values in adjtimex ADJ_SETOFFSET to avoid overflow"
-Signed-off-by: John Stultz <john.stultz@linaro.org>
-Cc: Sasha Levin <sasha.levin@oracle.com>
-Cc: Richard Cochran <richardcochran@gmail.com>
-Cc: Prarit Bhargava <prarit@redhat.com>
-Cc: David Herrmann <dh.herrmann@gmail.com>
-Link: http://lkml.kernel.org/r/1453417415-19110-2-git-send-email-john.stultz@linaro.org
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-(cherry picked from commit dd4e17ab704269bce71402285f5e8b9ac24b1eff)
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
----
- kernel/time/ntp.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
-index d7654e2..ab86177 100644
---- a/kernel/time/ntp.c
-+++ b/kernel/time/ntp.c
-@@ -679,8 +679,18 @@ int ntp_validate_timex(struct timex *txc)
-               if (!capable(CAP_SYS_TIME))
-                       return -EPERM;
- 
--              if (!timeval_inject_offset_valid(&txc->time))
--                      return -EINVAL;
-+              if (txc->modes & ADJ_NANO) {
-+                      struct timespec ts;
-+
-+                      ts.tv_sec = txc->time.tv_sec;
-+                      ts.tv_nsec = txc->time.tv_usec;
-+                      if (!timespec_inject_offset_valid(&ts))
-+                              return -EINVAL;
-+
-+              } else {
-+                      if (!timeval_inject_offset_valid(&txc->time))
-+                              return -EINVAL;
-+              }
-       }
- 
-       /*
--- 
-1.9.1