[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mm-commits
Subject:    [folded-merged] scsi-resolve-sg-buffer-const-ness-issue-fix.patch removed from -mm tree
From:       akpm () linux-foundation ! org
Date:       2015-06-30 21:51:08
Message-ID: 55930f4c.UU0Qk3HKm6aK+0Oh%akpm () linux-foundation ! org
[Download RAW message or body]


The patch titled
     Subject: scsi-resolve-sg-buffer-const-ness-issue-fix
has been removed from the -mm tree.  Its filename was
     scsi-resolve-sg-buffer-const-ness-issue-fix.patch

This patch was dropped because it was folded into \
scsi-resolve-sg-buffer-const-ness-issue.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: scsi-resolve-sg-buffer-const-ness-issue-fix

fix very broken build

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/scatterlist.h |    3 +++
 lib/scatterlist.c           |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff -puN include/linux/scatterlist.h~scsi-resolve-sg-buffer-const-ness-issue-fix \
                include/linux/scatterlist.h
--- a/include/linux/scatterlist.h~scsi-resolve-sg-buffer-const-ness-issue-fix
+++ a/include/linux/scatterlist.h
@@ -265,6 +265,9 @@ int sg_alloc_table_from_pages(struct sg_
 	unsigned long offset, unsigned long size,
 	gfp_t gfp_mask);
 
+size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
+		      size_t buflen, off_t skip, bool to_buffer);
+
 size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents,
 			   const void *buf, size_t buflen);
 size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents,
diff -puN lib/scatterlist.c~scsi-resolve-sg-buffer-const-ness-issue-fix \
                lib/scatterlist.c
--- a/lib/scatterlist.c~scsi-resolve-sg-buffer-const-ness-issue-fix
+++ a/lib/scatterlist.c
@@ -650,9 +650,8 @@ EXPORT_SYMBOL(sg_miter_stop);
  * Returns the number of copied bytes.
  *
  **/
-static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents,
-			     void *buf, size_t buflen, off_t skip,
-			     bool to_buffer)
+size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
+		      size_t buflen, off_t skip, bool to_buffer)
 {
 	unsigned int offset = 0;
 	struct sg_mapping_iter miter;
@@ -689,6 +688,7 @@ static size_t sg_copy_buffer(struct scat
 	local_irq_restore(flags);
 	return offset;
 }
+EXPORT_SYMBOL(sg_copy_buffer);
 
 /**
  * sg_copy_from_buffer - Copy from a linear buffer to an SG list
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

origin.patch
mm-meminit-inline-some-helper-functions.patch
mm-meminit-finish-initialisation-of-struct-pages-before-basic-setup.patch
devpts-if-initialization-failed-dont-crash-when-opening-dev-ptmx.patch
ipcshm-move-bug_on-check-into-shm_lock.patch
scsi-resolve-sg-buffer-const-ness-issue.patch
genalloc-rename-dev_get_gen_pool-to-gen_pool_get-fix.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[prev in list] [next in list] [prev in thread] [next in thread]