UBUNTU: Ubuntu-4.9.0-1.2

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 6bdcfb66d11c43aa0dfbb94c76f82e32c580bd00..78d87e9498123a80811e7d4fc819079db7fa3681 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,24 @@
-linux (4.9.0-1.2) UNRELEASED; urgency=low
+linux (4.9.0-1.2) zesty; urgency=low
+
+  * hio: SSD data corruption under stress test (LP: #1638700)
+    - SAUCE: hio: set bi_error field to signal an I/O error on a BIO
+    - SAUCE: hio: splitting bio in the entry of .make_request_fn
+
+  * hio Ubuntu sauce driver needs porting to 4.8 (LP: #1635594)
+    - SAUCE: import Huawei ES3000_V2 (2.1.0.23)
+    - SAUCE: hio: bio_endio() no longer takes errors arg
+    - SAUCE: hio: blk_queue make_request_fn now returns a blk_qc_t
+    - SAUCE: hio: use alloc_cpumask_var to avoid -Wframe-larger-than
+    - SAUCE: hio: fix mask maybe-uninitialized warning
+    - SAUCE: hio: port to v4.8 base
+    - [config] enable CONFIG_HIO (Huawei ES3000_V2 PCIe SSD driver)
+    - SAUCE: hio: Makefile and Kconfig
+    - [Config] Enforce CONFIG_HIO
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  * Miscellaneous Ubuntu changes
+    - rebase to v4.9-rc5
+    - zfs: remove the never implemented aio_fsync file operation
+    - [Config] Disable powerpc64-emb for FTBS
 
   [ Upstream Kernel Changes ]
 

diff --git a/debian.master/reconstruct b/debian.master/reconstruct
index 98865fb889e9df62ab7ee654a296540a0e00a53e..6a671d8a22bfbbccbffb901937a6a74215801b2c 100644 (file)
--- a/debian.master/reconstruct
+++ b/debian.master/reconstruct
@@ -1,3 +1,59 @@
 # Recreate any symlinks created since the orig.
 # Remove any files deleted from the orig.
+rm -f 'debian.master/abi/4.9.0-0.0/abiname'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/generic'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/generic.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/generic.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/ignore'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/ignore.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/lowlatency'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/lowlatency.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/amd64/lowlatency.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/arm64/generic'
+rm -f 'debian.master/abi/4.9.0-0.0/arm64/generic.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/arm64/generic.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/arm64/ignore'
+rm -f 'debian.master/abi/4.9.0-0.0/arm64/ignore.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/generic'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/generic-lpae'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/generic-lpae.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/generic-lpae.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/generic.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/generic.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/ignore'
+rm -f 'debian.master/abi/4.9.0-0.0/armhf/ignore.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/fwinfo'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/generic'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/generic.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/generic.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/ignore'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/ignore.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/lowlatency'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/lowlatency.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/i386/lowlatency.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/generic'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/generic.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/generic.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/ignore'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/ignore.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc-e500mc'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc-e500mc.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc-e500mc.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc-smp'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc-smp.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc-smp.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc64-emb'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc64-emb.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/powerpc/powerpc64-emb.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/ppc64el/generic'
+rm -f 'debian.master/abi/4.9.0-0.0/ppc64el/generic.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/ppc64el/generic.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/ppc64el/ignore'
+rm -f 'debian.master/abi/4.9.0-0.0/ppc64el/ignore.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/s390x/generic'
+rm -f 'debian.master/abi/4.9.0-0.0/s390x/generic.compiler'
+rm -f 'debian.master/abi/4.9.0-0.0/s390x/generic.modules'
+rm -f 'debian.master/abi/4.9.0-0.0/s390x/ignore'
+rm -f 'debian.master/abi/4.9.0-0.0/s390x/ignore.modules'
+rm -f 'drivers/media/usb/dvb-usb/gp8psk-fe.c'
 exit 0