[linux] 01/04: Merge tag 'debian/4.2.1-2'
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Sun Sep 27 18:23:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit 346c49682386059f842a76a0df56794dc90377c7
Merge: 54a83bb e80727a
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Sun Sep 27 18:20:06 2015 +0100
Merge tag 'debian/4.2.1-2'
Drop one added patch that is already included in 4.3-rc2.
debian/changelog | 12 ++
debian/config/hppa/config.parisc64-smp | 10 +
debian/config/kernelarch-mips/config.loongson-3 | 10 +
debian/installer/alpha/package-list | 5 +-
.../hppa/modules/hppa-parisc64-smp/i2c-modules | 1 -
debian/installer/hppa/package-list | 6 +-
debian/installer/m68k/package-list | 3 -
debian/installer/mips/package-list | 2 +-
debian/installer/mips64/package-list | 2 +-
debian/installer/mips64el/package-list | 3 +-
.../mipsel/modules/mipsel-loongson-3/i2c-modules | 1 -
debian/installer/mipsel/package-list | 3 +-
...deo-disable-hardware-timestamps-by-defaul.patch | 66 ++++++
...fix-race-on-protocol-netns-initialization.patch | 227 +++++++++++++++++++++
debian/patches/series | 2 +
15 files changed, 336 insertions(+), 17 deletions(-)
diff --cc debian/changelog
index 5a4978c,62e165e..eabf4ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+linux (4.3~rc2-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 26 Sep 2015 16:41:55 +0100
+
+ linux (4.2.1-2) unstable; urgency=medium
+
+ * media: uvcvideo: Disable hardware timestamps by default (Closes: #794327)
+ * [mips*] udeb: Remove 'Provides: ata-modules' from kernel-image
+ * [hppa/parisc64-smp,mips*el/loongson-3] udeb: Remove i2c-modules again, as
+ the drivers that belong in it are actually built-in (fixes FTBFS)
+ * sctp: fix race on protocol/netns initialization (CVE-2015-5283)
+ * [mips*] pgtable-bits.h: Correct _PAGE_GLOBAL_SHIFT build failure
+ (regression in 4.0, but not a build failure for us)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 27 Sep 2015 14:17:34 +0100
+
linux (4.2.1-1) unstable; urgency=medium
* New upstream stable update:
diff --cc debian/patches/series
index 9d82494,f9a58ae..bc2e334
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -81,4 -88,14 +81,6 @@@ features/all/grsecurity/grsecurity-kcon
#features/all/grsecurity/grsecurity-kbuild.patch
features/all/grsecurity/grkernsec_perf_harden.patch
-bugfix/all/gfs2-make-statistics-unsigned-suitable-for-use-with-.patch
-bugfix/all/workqueue-make-flush_workqueue-available-again-to-no.patch
-bugfix/all/dcache-handle-escaped-paths-in-prepend_path.patch
-bugfix/all/dcache-reduce-the-scope-of-i_lock-in-d_splice_alias.patch
-bugfix/all/vfs-test-for-and-handle-paths-that-are-unreachable-f.patch
-bugfix/all/rds-verify-the-underlying-transport-exists-before-cr.patch
-bugfix/all/e1000e-fix-tight-loop-implementation-of-systime-read.patch
bugfix/all/usb-whiteheat-fix-potential-null-deref-at-probe.patch
+ bugfix/all/media-uvcvideo-disable-hardware-timestamps-by-defaul.patch
+ bugfix/all/sctp-fix-race-on-protocol-netns-initialization.patch
-bugfix/mips/mips-pgtable-bits.h-correct-_page_global_shift-build.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list