[linux] 02/03: Update to 4.9-rc8

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Mon Dec 5 01:08:20 UTC 2016 

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 1c1ab88dbe34fc9094c941b4ac66934126cc310a
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Dec 5 01:02:03 2016 +0000

    Update to 4.9-rc8
---
 debian/changelog                                   |  5 +-
 ...onfig_modversions-in-a-slightly-weaker-fo.patch | 57 ----------------------
 debian/patches/debian/version.patch                | 14 +++---
 debian/patches/series                              |  1 -
 4 files changed, 11 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9bc396..ce86b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-linux (4.9~rc7-1~exp2) UNRELEASED; urgency=medium
+linux (4.9~rc8-1~exp1) UNRELEASED; urgency=medium
 
+  * New upstream release candidate
+
+  [ Ben Hutchings ]
   * radeon: Update package name in error message for missing firmware
   * [amd64] Remove xen-linux-system-<version> package
   * debian/control: Fix build-dependency on flex to work with new versions
diff --git a/debian/patches/bugfix/all/re-enable-config_modversions-in-a-slightly-weaker-fo.patch b/debian/patches/bugfix/all/re-enable-config_modversions-in-a-slightly-weaker-fo.patch
deleted file mode 100644
index 45be15f..0000000
--- a/debian/patches/bugfix/all/re-enable-config_modversions-in-a-slightly-weaker-fo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Linus Torvalds <torvalds at linux-foundation.org>
-Date: Tue, 29 Nov 2016 15:20:14 -0800
-Subject: Re-enable CONFIG_MODVERSIONS in a slightly weaker form
-Origin: https://git.kernel.org/linus/faaae2a581435f32781a105dda3501df388fddcb
-
-This enables CONFIG_MODVERSIONS again, but allows for missing symbol CRC
-information in order to work around the issue that newer binutils
-versions seem to occasionally drop the CRC on the floor.  binutils 2.26
-seems to work fine, while binutils 2.27 seems to break MODVERSIONS of
-symbols that have been defined in assembler files.
-
-[ We've had random missing CRC's before - it may be an old problem that
-  just is now reliably triggered with the weak asm symbols and a new
-  version of binutils ]
-
-Some day I really do want to remove MODVERSIONS entirely.  Sadly, today
-does not appear to be that day: Debian people apparently do want the
-option to enable MODVERSIONS to make it easier to have external modules
-across kernel versions, and this seems to be a fairly minimal fix for
-the annoying problem.
-
-Cc: Ben Hutchings <ben at decadent.org.uk>
-Acked-by: Michal Marek <mmarek at suse.com>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
----
- init/Kconfig    | 1 -
- kernel/module.c | 5 +++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/init/Kconfig b/init/Kconfig
-index c4fbc1e55c25..34407f15e6d3 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1945,7 +1945,6 @@ config MODULE_FORCE_UNLOAD
- 
- config MODVERSIONS
- 	bool "Module versioning support"
--	depends on BROKEN
- 	help
- 	  Usually, you have to use modules compiled with your kernel.
- 	  Saying Y here makes it sometimes possible to use modules
-diff --git a/kernel/module.c b/kernel/module.c
-index f57dd63186e6..0e54d5bf0097 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -1301,8 +1301,9 @@ static int check_version(Elf_Shdr *sechdrs,
- 		goto bad_version;
- 	}
- 
--	pr_warn("%s: no symbol version for %s\n", mod->name, symname);
--	return 0;
-+	/* Broken toolchain. Warn once, then let it go.. */
-+	pr_warn_once("%s: no symbol version for %s\n", mod->name, symname);
-+	return 1;
- 
- bad_version:
- 	pr_warn("%s: disagrees about version of symbol %s\n",
diff --git a/debian/patches/debian/version.patch b/debian/patches/debian/version.patch
index 2bb5568..505f0b7 100644
--- a/debian/patches/debian/version.patch
+++ b/debian/patches/debian/version.patch
@@ -9,16 +9,16 @@ are set.
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1004,7 +1004,7 @@ endif
+@@ -1024,7 +1024,7 @@ endif
  prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic
  
  prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
 -                   include/config/auto.conf
 +                   include/config/auto.conf include/generated/package.h
  	$(cmd_crmodverdir)
- 	$(Q)test -e include/generated/autoksyms.h || \
- 	    touch   include/generated/autoksyms.h
-@@ -1079,6 +1079,16 @@ define filechk_version.h
+ 
+ archprepare: archheaders archscripts prepare1 scripts_basic
+@@ -1097,6 +1097,16 @@ define filechk_version.h
  	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
  endef
  
@@ -35,7 +35,7 @@ are set.
  $(version_h): $(srctree)/Makefile FORCE
  	$(call filechk,version.h)
  	$(Q)rm -f $(old_version_h)
-@@ -1086,6 +1096,9 @@ $(version_h): $(srctree)/Makefile FORCE
+@@ -1104,6 +1114,9 @@ $(version_h): $(srctree)/Makefile FORCE
  include/generated/utsrelease.h: include/config/kernel.release FORCE
  	$(call filechk,utsrelease.h)
  
@@ -99,7 +99,7 @@ are set.
  
  #include <asm/pgtable.h>
  #include <asm/io.h>
-@@ -1309,8 +1310,9 @@ void show_regs(struct pt_regs * regs)
+@@ -1340,8 +1341,9 @@ void show_regs(struct pt_regs * regs)
  
  	printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
  	       regs->nip, regs->link, regs->ctr);
@@ -121,7 +121,7 @@ are set.
  
  #include <asm/uaccess.h>
  #include <asm/sections.h>
-@@ -3291,11 +3292,12 @@ void __init dump_stack_set_arch_desc(con
+@@ -3282,11 +3283,12 @@ void __init dump_stack_set_arch_desc(con
   */
  void dump_stack_print_info(const char *log_lvl)
  {
diff --git a/debian/patches/series b/debian/patches/series
index 0c31552..f91f738 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -102,7 +102,6 @@ bugfix/alpha/revert-alpha-move-exports-to-actual-definitions.patch
 bugfix/x86/x86-kbuild-enable-modversions-for-symbols-exported-f.patch
 bugfix/powerpc/powerpc-remove-mac-on-linux-hooks.patch
 bugfix/powerpc/powerpc-fix-missing-crcs-add-yet-more-asm-prototypes.patch
-bugfix/all/re-enable-config_modversions-in-a-slightly-weaker-fo.patch
 bugfix/all/module-disable-matching-missing-version-crc.patch
 
 # ABI maintenance

-- 
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