Merge branch 'merge' into sdk-v1.6.x

This reverts v3.13-rc3+ (78fd82238d0e5716) to v3.12, except for
commits which I noticed which appear relevant to the SDK.

Signed-off-by: Scott Wood <scottwood@freescale.com>

Conflicts:
	arch/powerpc/include/asm/kvm_host.h
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
	arch/powerpc/kvm/book3s_interrupts.S
	arch/powerpc/kvm/e500.c
	arch/powerpc/kvm/e500mc.c
	arch/powerpc/sysdev/fsl_soc.h
	drivers/Kconfig
	drivers/cpufreq/ppc-corenet-cpufreq.c
	drivers/dma/fsldma.c
	drivers/dma/s3c24xx-dma.c
	drivers/misc/Makefile
	drivers/mmc/host/sdhci-of-esdhc.c
	drivers/mtd/devices/m25p80.c
	drivers/net/ethernet/freescale/gianfar.h
	drivers/platform/Kconfig
	drivers/platform/Makefile
	drivers/spi/spi-fsl-espi.c
	include/crypto/algapi.h
	include/linux/netdev_features.h
	include/linux/skbuff.h
	include/net/ip.h
	net/core/ethtool.c

1 files changed, 10 insertions, 31 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index ba1ea67..26aabd7 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -21,7 +21,6 @@
 #include <linux/rbtree.h>
 #include <linux/ktime.h>
 #include <linux/percpu.h>
-#include <linux/lockref.h>
 
 #define DIO_WAIT	0x00000010
 #define DIO_METADATA	0x00000020
@@ -72,7 +71,6 @@ struct gfs2_bitmap {
 	u32 bi_offset;
 	u32 bi_start;
 	u32 bi_len;
-	u32 bi_blocks;
 };
 
 struct gfs2_rgrpd {
@@ -103,25 +101,19 @@ struct gfs2_rgrpd {
 
 struct gfs2_rbm {
 	struct gfs2_rgrpd *rgd;
+	struct gfs2_bitmap *bi;	/* Bitmap must belong to the rgd */
 	u32 offset;		/* The offset is bitmap relative */
-	int bii;		/* Bitmap index */
 };
 
-static inline struct gfs2_bitmap *rbm_bi(const struct gfs2_rbm *rbm)
-{
-	return rbm->rgd->rd_bits + rbm->bii;
-}
-
 static inline u64 gfs2_rbm_to_block(const struct gfs2_rbm *rbm)
 {
-	return rbm->rgd->rd_data0 + (rbm_bi(rbm)->bi_start * GFS2_NBBY) +
-		rbm->offset;
+	return rbm->rgd->rd_data0 + (rbm->bi->bi_start * GFS2_NBBY) + rbm->offset;
 }
 
 static inline bool gfs2_rbm_eq(const struct gfs2_rbm *rbm1,
 			       const struct gfs2_rbm *rbm2)
 {
-	return (rbm1->rgd == rbm2->rgd) && (rbm1->bii == rbm2->bii) &&
+	return (rbm1->rgd == rbm2->rgd) && (rbm1->bi == rbm2->bi) && 
 	       (rbm1->offset == rbm2->offset);
 }
 
@@ -286,20 +278,6 @@ struct gfs2_blkreserv {
 	unsigned int rs_qa_qd_num;
 };
 
-/*
- * Allocation parameters
- * @target: The number of blocks we'd ideally like to allocate
- * @aflags: The flags (e.g. Orlov flag)
- *
- * The intent is to gradually expand this structure over time in
- * order to give more information, e.g. alignment, min extent size
- * to the allocation code.
- */
-struct gfs2_alloc_parms {
-	u32 target;
-	u32 aflags;
-};
-
 enum {
 	GLF_LOCK			= 1,
 	GLF_DEMOTE			= 3,
@@ -322,9 +300,9 @@ struct gfs2_glock {
 	struct gfs2_sbd *gl_sbd;
 	unsigned long gl_flags;		/* GLF_... */
 	struct lm_lockname gl_name;
+	atomic_t gl_ref;
 
-	struct lockref gl_lockref;
-#define gl_spin gl_lockref.lock
+	spinlock_t gl_spin;
 
 	/* State fields protected by gl_spin */
 	unsigned int gl_state:2,	/* Current state */
@@ -420,10 +398,11 @@ enum {
 
 struct gfs2_quota_data {
 	struct list_head qd_list;
-	struct kqid qd_id;
-	struct lockref qd_lockref;
-	struct list_head qd_lru;
+	struct list_head qd_reclaim;
 
+	atomic_t qd_count;
+
+	struct kqid qd_id;
 	unsigned long qd_flags;		/* QDF_... */
 
 	s64 qd_change;
@@ -537,6 +516,7 @@ struct gfs2_tune {
 
 	unsigned int gt_logd_secs;
 
+	unsigned int gt_quota_simul_sync; /* Max quotavals to sync at once */
 	unsigned int gt_quota_warn_period; /* Secs between quota warn msgs */
 	unsigned int gt_quota_scale_num; /* Numerator */
 	unsigned int gt_quota_scale_den; /* Denominator */
@@ -714,7 +694,6 @@ struct gfs2_sbd {
 	struct list_head sd_quota_list;
 	atomic_t sd_quota_count;
 	struct mutex sd_quota_mutex;
-	struct mutex sd_quota_sync_mutex;
 	wait_queue_head_t sd_quota_wait;
 	struct list_head sd_trunc_list;
 	spinlock_t sd_trunc_lock;