[arch-commits] Commit in linux-lts/trunk (3 files)

Andreas Radke andyrtr at archlinux.org
Sat Jun 6 18:54:42 UTC 2015 

    Date: Saturday, June 6, 2015 @ 20:54:42
  Author: andyrtr
Revision: 240381

upgpkg: linux-lts 3.14.44-1

upstream update 3.14.44

Modified:
  linux-lts/trunk/PKGBUILD
  linux-lts/trunk/gcc5_buildfixes.diff
Deleted:
  linux-lts/trunk/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch

------------------------------------------------------------+
 PKGBUILD                                                   |   13 --
 gcc5_buildfixes.diff                                       |   66 -----------
 md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch |   50 --------
 3 files changed, 4 insertions(+), 125 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-06 18:47:17 UTC (rev 240380)
+++ PKGBUILD	2015-06-06 18:54:42 UTC (rev 240381)
@@ -4,8 +4,8 @@
 
 pkgbase=linux-lts
 _srcname=linux-3.14
-pkgver=3.14.43
-pkgrel=2
+pkgver=3.14.44
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -22,13 +22,12 @@
         '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch'
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
-        'md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch'
         'gcc5_buildfixes.diff'
         )
 # https://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
 sha256sums=('61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa'
             'SKIP'
-            'cd6b9f6c9634605db129030ee2f5082903d59a21381fb2c00bbb25e7931432fd'
+            '5af4e26194d3195e5a7c9235b0e6b60f577e7948ba2e1f653341d6263ef2ffc0'
             'SKIP'
             '9f0caf74d70599ac4eda356a42c7d9cb116f0cf42e87f165a383e4d215ae212d'
             'f40e1c54f53feaf3b35a8fca19a98c0f48d83cb8f9738eb8f97fc860b3a93e46'
@@ -38,8 +37,7 @@
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            'bc83293e64653d60793708a0e277741f57c018f5ea3551a8aff3a220df917ceb'
-            '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7')
+            '9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a')
 validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds at linux-foundation.org>
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg at kroah.com>
              )
@@ -58,9 +56,6 @@
   # add upstream patch
   patch -p1 -i "${srcdir}/patch-${pkgver}"
 
-  # https://bugzilla.kernel.org/show_bug.cgi?id=98501
-  patch -Np1 -i "${srcdir}/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch"
-
   # buildfixes for gcc5
   # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/scsi/qla2xxx/qla_nx2.c?id=9493c2422cae272d6f1f567cbb424195defe4176
   # https://lkml.org/lkml/2014/11/9/27

Modified: gcc5_buildfixes.diff
===================================================================
--- gcc5_buildfixes.diff	2015-06-06 18:47:17 UTC (rev 240380)
+++ gcc5_buildfixes.diff	2015-06-06 18:54:42 UTC (rev 240381)
@@ -1,69 +1,3 @@
-From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001
-From: Chen Gang <gang.chen.5i5j at gmail.com>
-Date: Sat, 1 Nov 2014 19:46:12 +0800
-Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h'
-
-Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and
-qla8044_need_reset_handler(). At present, within upstream next kernel
-source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c".
-
-The related error and warnings (with allmodconfig under tile):
-
-    CC [M]  drivers/scsi/qla2xxx/qla_nx2.o
-  drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration
-   qla8044_need_reset_handler(struct scsi_qla_host *vha)
-   ^
-  In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0,
-                   from drivers/scsi/qla2xxx/qla_nx2.c:11:
-  drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here
-   extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha);
-                      ^
-  drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined
-  make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1
-  make[2]: *** [drivers/scsi/qla2xxx] Error 2
-  make[1]: *** [drivers/scsi] Error 2
-  make: *** [drivers] Error 2
-
-    CC [M]  drivers/scsi/qla2xxx/qla_tmpl.o
-  In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0,
-                   from drivers/scsi/qla2xxx/qla_tmpl.c:7:
-  drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined
-   extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha);
-                    ^
-
-Signed-off-by: Chen Gang <gang.chen.5i5j at gmail.com>
-Acked-by: Saurav Kashyap <saurav.kashyap at qlogic.com>
-Signed-off-by: Christoph Hellwig <hch at lst.de>
-
-diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
-index b1865a7..7686bfe 100644
---- a/drivers/scsi/qla2xxx/qla_gbl.h
-+++ b/drivers/scsi/qla2xxx/qla_gbl.h
-@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha);
- extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg);
- extern void qla8044_wr_direct(struct scsi_qla_host *vha,
- 			      const uint32_t crb_reg, const uint32_t value);
--extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha);
--extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha);
- extern int qla8044_device_state_handler(struct scsi_qla_host *vha);
- extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha);
- extern void qla8044_clear_drv_active(struct qla_hw_data *);
-diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
-index 24a8528..ed4d6b6 100644
---- a/drivers/scsi/qla2xxx/qla_nx2.c
-+++ b/drivers/scsi/qla2xxx/qla_nx2.c
-@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha,
- 	return;
- }
- 
--inline void
-+static inline void
- qla8044_set_qsnt_ready(struct scsi_qla_host *vha)
- {
- 	uint32_t qsnt_state;
--- 
-cgit v0.10.2
-
 diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
 index e2b3985..c245ea3 100644
 --- a/lib/mpi/mpi-inline.h

Deleted: md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
===================================================================
--- md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch	2015-06-06 18:47:17 UTC (rev 240380)
+++ md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch	2015-06-06 18:54:42 UTC (rev 240381)
@@ -1,50 +0,0 @@
-From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001
-From: Eric Work <work.eric at gmail.com>
-Date: Mon, 18 May 2015 23:26:23 -0700
-Subject: [PATCH] md/raid0: fix restore to sector variable in
- raid0_make_request
-
-The variable "sector" in "raid0_make_request()" was improperly updated
-by a call to "sector_div()" which modifies its first argument in place.
-Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable
-after the call for later re-use.  Unfortunetly the restore was done after
-the referenced variable "bio" was advanced.  This lead to the original
-value and the restored value being different.  Here we move this line to
-the proper place.
-
-One observed side effect of this bug was discarding a file though
-unlinking would cause an unrelated file's contents to be discarded.
-
-Signed-off-by: NeilBrown <neilb at suse.de>
-Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.")
-Cc: stable at vger.kernel.org (any that received above backport)
-URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501
----
- drivers/md/raid0.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
-index 6a68ef5..efb654e 100644
---- a/drivers/md/raid0.c
-+++ b/drivers/md/raid0.c
-@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
- 			 ? (sector & (chunk_sects-1))
- 			 : sector_div(sector, chunk_sects));
- 
-+		/* Restore due to sector_div */
-+		sector = bio->bi_iter.bi_sector;
-+
- 		if (sectors < bio_sectors(bio)) {
- 			split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);
- 			bio_chain(split, bio);
-@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
- 			split = bio;
- 		}
- 
--		sector = bio->bi_iter.bi_sector;
- 		zone = find_zone(mddev->private, &sector);
- 		tmp_dev = map_sector(mddev, zone, sector, &sector);
- 		split->bi_bdev = tmp_dev->bdev;
--- 
-2.4.1
-

More information about the arch-commits mailing list