Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

Two bits were appended to the end of the bitfield
list in struct scsi_device.  Resolve that conflict
by including both bits.

Conflicts:
	include/scsi/scsi_device.h

1 files changed, 0 insertions, 30 deletions

diff --git a/lib/mpi/mpih-mul.c b/lib/mpi/mpih-mul.c
index c69c5eef233b..7c841719fdfb 100644
--- a/lib/mpi/mpih-mul.c
+++ b/lib/mpi/mpih-mul.c
@@ -330,36 +330,6 @@ mpih_sqr_n(mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t size, mpi_ptr_t tspace)
         }
 }
 
-/* This should be made into an inline function in gmp.h.  */
-int mpihelp_mul_n(mpi_ptr_t prodp, mpi_ptr_t up, mpi_ptr_t vp, mpi_size_t size)
-{
-        if (up == vp) {
-                if (size < KARATSUBA_THRESHOLD)
-                        mpih_sqr_n_basecase(prodp, up, size);
-                else {
-                        mpi_ptr_t tspace;
-                        tspace = mpi_alloc_limb_space(2 * size);
-                        if (!tspace)
-                                return -ENOMEM;
-                        mpih_sqr_n(prodp, up, size, tspace);
-                        mpi_free_limb_space(tspace);
-                }
-        } else {
-                if (size < KARATSUBA_THRESHOLD)
-                        mul_n_basecase(prodp, up, vp, size);
-                else {
-                        mpi_ptr_t tspace;
-                        tspace = mpi_alloc_limb_space(2 * size);
-                        if (!tspace)
-                                return -ENOMEM;
-                        mul_n(prodp, up, vp, size, tspace);
-                        mpi_free_limb_space(tspace);
-                }
-        }
-
-        return 0;
-}
-
 int
 mpihelp_mul_karatsuba_case(mpi_ptr_t prodp,
                            mpi_ptr_t up, mpi_size_t usize,