[obsolete] linux-next-git-rejects.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     linux-next-git-rejects
has been removed from the -mm tree.  Its filename was
     linux-next-git-rejects.patch

This patch was dropped because it is obsolete

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: linux-next-git-rejects
From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/feature-removal-schedule.txt |   22 --
 arch/arm/common/dmabounce.c                |    9 -
 arch/x86/pci/xen.c                         |   94 -----------
 drivers/hwmon/adm1275.c                    |    7 
 drivers/hwmon/lm95241.c                    |   22 --
 drivers/hwmon/pmbus_core.c                 |    4 
 drivers/net/vmxnet3/vmxnet3_int.h          |    7 
 drivers/net/wireless/iwlwifi/iwl-2000.c    |    3 
 drivers/net/wireless/iwlwifi/iwl-tx.c      |  150 -------------------
 fs/cifs/cifsproto.h                        |    5 
 fs/cifs/connect.c                          |   12 -
 net/bluetooth/l2cap_core.c                 |    5 
 12 files changed, 340 deletions(-)

diff -puN arch/x86/pci/xen.c~linux-next-git-rejects arch/x86/pci/xen.c
--- a/arch/x86/pci/xen.c~linux-next-git-rejects
+++ a/arch/x86/pci/xen.c
@@ -372,83 +372,6 @@ int __init pci_xen_hvm_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_XEN_DOM0
-<<<<<<< HEAD
-static int xen_register_pirq(u32 gsi, int gsi_override, int triggering)
-{
-	int rc, pirq, irq = -1;
-	struct physdev_map_pirq map_irq;
-	int shareable = 0;
-	char *name;
-
-	if (!xen_pv_domain())
-		return -1;
-
-	if (triggering == ACPI_EDGE_SENSITIVE) {
-		shareable = 0;
-		name = "ioapic-edge";
-	} else {
-		shareable = 1;
-		name = "ioapic-level";
-	}
-	pirq = xen_allocate_pirq_gsi(gsi);
-	if (pirq < 0)
-		goto out;
-
-	if (gsi_override >= 0)
-		irq = xen_bind_pirq_gsi_to_irq(gsi_override, pirq, shareable, name);
-	else
-		irq = xen_bind_pirq_gsi_to_irq(gsi, pirq, shareable, name);
-	if (irq < 0)
-		goto out;
-
-	printk(KERN_DEBUG "xen: --> pirq=%d -> irq=%d (gsi=%d)\n", pirq, irq, gsi);
-
-	map_irq.domid = DOMID_SELF;
-	map_irq.type = MAP_PIRQ_TYPE_GSI;
-	map_irq.index = gsi;
-	map_irq.pirq = pirq;
-
-	rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
-	if (rc) {
-		printk(KERN_WARNING "xen map irq failed %d\n", rc);
-		return -1;
-	}
-
-out:
-	return irq;
-}
-
-static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polarity)
-{
-	int rc, irq;
-	struct physdev_setup_gsi setup_gsi;
-
-	if (!xen_pv_domain())
-		return -1;
-
-	printk(KERN_DEBUG "xen: registering gsi %u triggering %d polarity %d\n",
-			gsi, triggering, polarity);
-
-	irq = xen_register_pirq(gsi, gsi_override, triggering);
-
-	setup_gsi.gsi = gsi;
-	setup_gsi.triggering = (triggering == ACPI_EDGE_SENSITIVE ? 0 : 1);
-	setup_gsi.polarity = (polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
-
-	rc = HYPERVISOR_physdev_op(PHYSDEVOP_setup_gsi, &setup_gsi);
-	if (rc == -EEXIST)
-		printk(KERN_INFO "Already setup the GSI :%d\n", gsi);
-	else if (rc) {
-		printk(KERN_ERR "Failed to setup GSI :%d, err_code:%d\n",
-				gsi, rc);
-	}
-
-	return irq;
-}
-
-=======
->>>>>>> linux-next/akpm-end
 static __init void xen_setup_acpi_sci(void)
 {
 	int rc;
@@ -483,16 +406,9 @@ static __init void xen_setup_acpi_sci(vo
 	 * the ACPI interpreter and keels over since IRQ 9 has not been
 	 * setup as we had setup IRQ 20 for it).
 	 */
-<<<<<<< HEAD
-	/* Check whether the GSI != IRQ */
-	if (acpi_gsi_to_irq(gsi, &irq) == 0) {
-		if (irq >= 0 && irq != gsi)
-			/* Bugger, we MUST have that IRQ. */
-=======
 	if (acpi_gsi_to_irq(gsi, &irq) == 0) {
 		/* Use the provided value if it's valid. */
 		if (irq >= 0)
->>>>>>> linux-next/akpm-end
 			gsi_override = irq;
 	}
 
@@ -504,12 +420,7 @@ static __init void xen_setup_acpi_sci(vo
 
 int __init pci_xen_initial_domain(void)
 {
-<<<<<<< HEAD
-	return xen_register_gsi(gsi, -1 /* no GSI override */, trigger, polarity);
-}
-=======
 	int irq;
->>>>>>> linux-next/akpm-end
 
 #ifdef CONFIG_PCI_MSI
 	x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
@@ -525,12 +436,8 @@ int __init pci_xen_initial_domain(void)
 			continue;
 
 		xen_register_pirq(irq, -1 /* no GSI override */,
-<<<<<<< HEAD
-			trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE);
-=======
 			trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE,
 			true /* Map GSI to PIRQ */);
->>>>>>> linux-next/akpm-end
 	}
 	if (0 == nr_ioapics) {
 		for (irq = 0; irq < NR_IRQS_LEGACY; irq++)
@@ -611,4 +518,3 @@ int xen_unregister_device_domain_owner(s
 	return 0;
 }
 EXPORT_SYMBOL_GPL(xen_unregister_device_domain_owner);
-#endif
diff -puN drivers/net/vmxnet3/vmxnet3_int.h~linux-next-git-rejects drivers/net/vmxnet3/vmxnet3_int.h
--- a/drivers/net/vmxnet3/vmxnet3_int.h~linux-next-git-rejects
+++ a/drivers/net/vmxnet3/vmxnet3_int.h
@@ -70,17 +70,10 @@
 /*
  * Version numbers
  */
-<<<<<<< HEAD
-#define VMXNET3_DRIVER_VERSION_STRING   "1.1.18.0-k"
-
-/* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01011200
-=======
 #define VMXNET3_DRIVER_VERSION_STRING   "1.1.14.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
 #define VMXNET3_DRIVER_VERSION_NUM      0x01010E00
->>>>>>> linux-next/akpm-end
 
 #if defined(CONFIG_PCI_MSI)
 	/* RSS only makes sense if MSI-X is supported. */
diff -puN drivers/net/wireless/iwlwifi/iwl-2000.c~linux-next-git-rejects drivers/net/wireless/iwlwifi/iwl-2000.c
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c~linux-next-git-rejects
+++ a/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -66,12 +66,9 @@
 
 #define IWL105_FW_PRE "iwlwifi-105-"
 #define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode"
-<<<<<<< HEAD
-=======
 
 #define IWL135_FW_PRE "iwlwifi-135-"
 #define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE #api ".ucode"
->>>>>>> linux-next/akpm-end
 
 static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
 {
diff -puN drivers/net/wireless/iwlwifi/iwl-tx.c~linux-next-git-rejects drivers/net/wireless/iwlwifi/iwl-tx.c
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c~linux-next-git-rejects
+++ a/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -126,11 +126,7 @@ static inline u8 iwl_tfd_get_num_tbs(str
 }
 
 static void iwlagn_unmap_tfd(struct iwl_priv *priv, struct iwl_cmd_meta *meta,
-<<<<<<< HEAD
-			     struct iwl_tfd *tfd, int dma_dir)
-=======
 			     struct iwl_tfd *tfd, enum dma_data_direction dma_dir)
->>>>>>> linux-next/akpm-end
 {
 	int i;
 	int num_tbs;
@@ -153,11 +149,7 @@ static void iwlagn_unmap_tfd(struct iwl_
 
 	/* Unmap chunks, if any. */
 	for (i = 1; i < num_tbs; i++)
-<<<<<<< HEAD
-		pci_unmap_single(dev, iwl_tfd_tb_get_addr(tfd, i),
-=======
 		dma_unmap_single(priv->bus.dev, iwl_tfd_tb_get_addr(tfd, i),
->>>>>>> linux-next/akpm-end
 				iwl_tfd_tb_get_len(tfd, i), dma_dir);
 }
 
@@ -175,11 +167,7 @@ void iwlagn_txq_free_tfd(struct iwl_priv
 	int index = txq->q.read_ptr;
 
 	iwlagn_unmap_tfd(priv, &txq->meta[index], &tfd_tmp[index],
-<<<<<<< HEAD
-			 PCI_DMA_TODEVICE);
-=======
 			 DMA_TO_DEVICE);
->>>>>>> linux-next/akpm-end
 
 	/* free SKB */
 	if (txq->txb) {
@@ -305,11 +293,7 @@ void iwl_cmd_queue_unmap(struct iwl_priv
 
 		if (txq->meta[i].flags & CMD_MAPPED) {
 			iwlagn_unmap_tfd(priv, &txq->meta[i], &txq->tfds[i],
-<<<<<<< HEAD
-					 PCI_DMA_BIDIRECTIONAL);
-=======
 					 DMA_BIDIRECTIONAL);
->>>>>>> linux-next/akpm-end
 			txq->meta[i].flags = 0;
 		}
 
@@ -423,127 +407,6 @@ int iwl_queue_init(struct iwl_priv *priv
 	return 0;
 }
 
-<<<<<<< HEAD
-/**
- * iwl_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue
- */
-static int iwl_tx_queue_alloc(struct iwl_priv *priv,
-			      struct iwl_tx_queue *txq, u32 id)
-{
-	struct device *dev = &priv->pci_dev->dev;
-	size_t tfd_sz = priv->hw_params.tfd_size * TFD_QUEUE_SIZE_MAX;
-
-	/* Driver private data, only for Tx (not command) queues,
-	 * not shared with device. */
-	if (id != priv->cmd_queue) {
-		txq->txb = kzalloc(sizeof(txq->txb[0]) *
-				   TFD_QUEUE_SIZE_MAX, GFP_KERNEL);
-		if (!txq->txb) {
-			IWL_ERR(priv, "kmalloc for auxiliary BD "
-				  "structures failed\n");
-			goto error;
-		}
-	} else {
-		txq->txb = NULL;
-	}
-
-	/* Circular buffer of transmit frame descriptors (TFDs),
-	 * shared with device */
-	txq->tfds = dma_alloc_coherent(dev, tfd_sz, &txq->q.dma_addr,
-				       GFP_KERNEL);
-	if (!txq->tfds) {
-		IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n", tfd_sz);
-		goto error;
-	}
-	txq->q.id = id;
-
-	return 0;
-
- error:
-	kfree(txq->txb);
-	txq->txb = NULL;
-
-	return -ENOMEM;
-}
-
-/**
- * iwl_tx_queue_init - Allocate and initialize one tx/cmd queue
- */
-int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
-		      int slots_num, u32 txq_id)
-{
-	int i, len;
-	int ret;
-
-	txq->meta = kzalloc(sizeof(struct iwl_cmd_meta) * slots_num,
-			    GFP_KERNEL);
-	txq->cmd = kzalloc(sizeof(struct iwl_device_cmd *) * slots_num,
-			   GFP_KERNEL);
-
-	if (!txq->meta || !txq->cmd)
-		goto out_free_arrays;
-
-	len = sizeof(struct iwl_device_cmd);
-	for (i = 0; i < slots_num; i++) {
-		txq->cmd[i] = kmalloc(len, GFP_KERNEL);
-		if (!txq->cmd[i])
-			goto err;
-	}
-
-	/* Alloc driver data array and TFD circular buffer */
-	ret = iwl_tx_queue_alloc(priv, txq, txq_id);
-	if (ret)
-		goto err;
-
-	txq->need_update = 0;
-
-	/*
-	 * For the default queues 0-3, set up the swq_id
-	 * already -- all others need to get one later
-	 * (if they need one at all).
-	 */
-	if (txq_id < 4)
-		iwl_set_swq_id(txq, txq_id, txq_id);
-
-	/* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
-	 * iwl_queue_inc_wrap and iwl_queue_dec_wrap are broken. */
-	BUILD_BUG_ON(TFD_QUEUE_SIZE_MAX & (TFD_QUEUE_SIZE_MAX - 1));
-
-	/* Initialize queue's high/low-water marks, and head/tail indexes */
-	ret = iwl_queue_init(priv, &txq->q, TFD_QUEUE_SIZE_MAX, slots_num, txq_id);
-	if (ret)
-		return ret;
-
-	/* Tell device where to find queue */
-	iwlagn_tx_queue_init(priv, txq);
-
-	return 0;
-err:
-	for (i = 0; i < slots_num; i++)
-		kfree(txq->cmd[i]);
-out_free_arrays:
-	kfree(txq->meta);
-	kfree(txq->cmd);
-
-	return -ENOMEM;
-}
-
-void iwl_tx_queue_reset(struct iwl_priv *priv, struct iwl_tx_queue *txq,
-			int slots_num, u32 txq_id)
-{
-	memset(txq->meta, 0, sizeof(struct iwl_cmd_meta) * slots_num);
-
-	txq->need_update = 0;
-
-	/* Initialize queue's high/low-water marks, and head/tail indexes */
-	iwl_queue_init(priv, &txq->q, TFD_QUEUE_SIZE_MAX, slots_num, txq_id);
-
-	/* Tell device where to find queue */
-	iwlagn_tx_queue_init(priv, txq);
-}
-
-=======
->>>>>>> linux-next/akpm-end
 /*************** HOST COMMAND QUEUE FUNCTIONS   *****/
 
 /**
@@ -692,21 +555,12 @@ int iwl_enqueue_hcmd(struct iwl_priv *pr
 			continue;
 		if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))
 			continue;
-<<<<<<< HEAD
-		phys_addr = pci_map_single(priv->pci_dev, (void *)cmd->data[i],
-					   cmd->len[i], PCI_DMA_BIDIRECTIONAL);
-		if (pci_dma_mapping_error(priv->pci_dev, phys_addr)) {
-			iwlagn_unmap_tfd(priv, out_meta,
-					 &txq->tfds[q->write_ptr],
-					 PCI_DMA_BIDIRECTIONAL);
-=======
 		phys_addr = dma_map_single(priv->bus.dev, (void *)cmd->data[i],
 					   cmd->len[i], DMA_BIDIRECTIONAL);
 		if (dma_mapping_error(priv->bus.dev, phys_addr)) {
 			iwlagn_unmap_tfd(priv, out_meta,
 					 &txq->tfds[q->write_ptr],
 					 DMA_BIDIRECTIONAL);
->>>>>>> linux-next/akpm-end
 			idx = -ENOMEM;
 			goto out;
 		}
@@ -810,11 +664,7 @@ void iwl_tx_cmd_complete(struct iwl_priv
 	cmd = txq->cmd[cmd_index];
 	meta = &txq->meta[cmd_index];
 
-<<<<<<< HEAD
-	iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], PCI_DMA_BIDIRECTIONAL);
-=======
 	iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
->>>>>>> linux-next/akpm-end
 
 	/* Input error checking is done when commands are added to queue. */
 	if (meta->flags & CMD_WANT_SKB) {
diff -puN arch/arm/common/dmabounce.c~linux-next-git-rejects arch/arm/common/dmabounce.c
--- a/arch/arm/common/dmabounce.c~linux-next-git-rejects
+++ a/arch/arm/common/dmabounce.c
@@ -241,20 +241,11 @@ static int needs_bounce(struct device *d
 	return !!dev->archdata.dmabounce->needs_bounce(dev, dma_addr, size);
 }
 
-<<<<<<< HEAD
-		buf = alloc_safe_buffer(device_info, ptr, size, dir);
-		if (buf == 0) {
-			dev_err(dev, "%s: unable to map unsafe buffer %p!\n",
-			       __func__, ptr);
-			return ~0;
-		}
-=======
 static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,
 		enum dma_data_direction dir)
 {
 	struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
 	struct safe_buffer *buf;
->>>>>>> linux-next/akpm-end
 
 	if (device_info)
 		DO_STATS ( device_info->map_op_count++ );
diff -puN drivers/hwmon/lm95241.c~linux-next-git-rejects drivers/hwmon/lm95241.c
--- a/drivers/hwmon/lm95241.c~linux-next-git-rejects
+++ a/drivers/hwmon/lm95241.c
@@ -100,20 +100,9 @@ struct lm95241_data {
 /* Conversions */
 static int temp_from_reg_signed(u8 val_h, u8 val_l)
 {
-<<<<<<< HEAD
-	s16 val_hl = (val_h << 8) | val_l;
-	return val_hl * 1000 / 256;
-}
-
-static int temp_from_reg_unsigned(u8 val_h, u8 val_l)
-{
-	u16 val_hl = (val_h << 8) | val_l;
-	return val_hl * 1000 / 256;
-=======
 	if (val_h & 0x80)
 		return (val_h - 0x100) * 1000;
 	return val_h * 1000 + val_l * 1000 / 256;
->>>>>>> linux-next/akpm-end
 }
 
 static struct lm95241_data *lm95241_update_device(struct device *dev)
@@ -349,21 +338,10 @@ static int lm95241_detect(struct i2c_cli
 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
 		return -ENODEV;
 
-<<<<<<< HEAD
-	if ((i2c_smbus_read_byte_data(new_client, LM95241_REG_R_MAN_ID)
-	     == MANUFACTURER_ID)
-	    && (i2c_smbus_read_byte_data(new_client, LM95241_REG_R_CHIP_ID)
-		== DEFAULT_REVISION)) {
-		name = DEVNAME;
-	} else {
-		dev_dbg(&adapter->dev, "LM95241 detection failed at 0x%02x\n",
-			address);
-=======
 	if (i2c_smbus_read_byte_data(new_client, LM95241_REG_R_MAN_ID)
 	    != MANUFACTURER_ID
 	    || i2c_smbus_read_byte_data(new_client, LM95241_REG_R_CHIP_ID)
 	    != DEFAULT_REVISION)
->>>>>>> linux-next/akpm-end
 		return -ENODEV;
 
 	name = DEVNAME;
diff -puN Documentation/feature-removal-schedule.txt~linux-next-git-rejects Documentation/feature-removal-schedule.txt
--- a/Documentation/feature-removal-schedule.txt~linux-next-git-rejects
+++ a/Documentation/feature-removal-schedule.txt
@@ -560,27 +560,6 @@ Who:	Laurent Pinchart <laurent.pinchart@
 
 ----------------------------
 
-<<<<<<< HEAD
-What:	For VIDIOC_S_FREQUENCY the type field must match the device node's type.
-	If not, return -EINVAL.
-When:	3.2
-Why:	It makes no sense to switch the tuner to radio mode by calling
-	VIDIOC_S_FREQUENCY on a video node, or to switch the tuner to tv mode by
-	calling VIDIOC_S_FREQUENCY on a radio node. This is the first step of a
-	move to more consistent handling of tv and radio tuners.
-Who:	Hans Verkuil <hans.verkuil@cisco.com>
-
-----------------------------
-
-What:	Opening a radio device node will no longer automatically switch the
-	tuner mode from tv to radio.
-When:	3.3
-Why:	Just opening a V4L device should not change the state of the hardware
-	like that. It's very unexpected and against the V4L spec. Instead, you
-	switch to radio mode by calling VIDIOC_S_FREQUENCY. This is the second
-	and last step of the move to consistent handling of tv and radio tuners.
-Who:	Hans Verkuil <hans.verkuil@cisco.com>
-=======
 What:   threeg and interface sysfs files in /sys/devices/platform/acer-wmi
 When:   2012
 Why:    In 2.6.40, we can now autodetect internal 3G device and already have
@@ -598,6 +577,5 @@ What:	g_file_storage driver
 When:	3.8
 Why:	This driver has been superseded by g_mass_storage.
 Who:	Alan Stern <stern@rowland.harvard.edu>
->>>>>>> linux-next/akpm-end
 
 ----------------------------
diff -puN fs/cifs/cifsproto.h~linux-next-git-rejects fs/cifs/cifsproto.h
--- a/fs/cifs/cifsproto.h~linux-next-git-rejects
+++ a/fs/cifs/cifsproto.h
@@ -155,13 +155,8 @@ extern void cifs_setup_cifs_sb(struct sm
 			       struct cifs_sb_info *cifs_sb);
 extern int cifs_match_super(struct super_block *, void *);
 extern void cifs_cleanup_volume_info(struct smb_vol *pvolume_info);
-<<<<<<< HEAD
-extern struct smb_vol *cifs_get_volume_info(char *mount_data,
-					    const char *devname);
-=======
 extern int cifs_setup_volume_info(struct smb_vol **pvolume_info,
 				  char *mount_data, const char *devname);
->>>>>>> linux-next/akpm-end
 extern int cifs_mount(struct cifs_sb_info *, struct smb_vol *);
 extern void cifs_umount(struct cifs_sb_info *);
 extern void cifs_dfs_release_automount_timer(void);
diff -puN fs/cifs/connect.c~linux-next-git-rejects fs/cifs/connect.c
--- a/fs/cifs/connect.c~linux-next-git-rejects
+++ a/fs/cifs/connect.c
@@ -2833,18 +2833,12 @@ is_path_accessible(int xid, struct cifs_
 	return rc;
 }
 
-<<<<<<< HEAD
-static void
-cleanup_volume_info_contents(struct smb_vol *volume_info)
-{
-=======
 void
 cifs_cleanup_volume_info(struct smb_vol *volume_info)
 {
 	if (!volume_info)
 		return;
 
->>>>>>> linux-next/akpm-end
 	kfree(volume_info->username);
 	kzfree(volume_info->password);
 	kfree(volume_info->UNC);
@@ -2861,10 +2855,7 @@ cifs_cleanup_volume_info(struct smb_vol 
 		return;
 	cleanup_volume_info_contents(volume_info);
 	kfree(volume_info);
-<<<<<<< HEAD
-=======
 	return;
->>>>>>> linux-next/akpm-end
 }
 
 
@@ -2992,13 +2983,10 @@ cifs_setup_volume_info(struct smb_vol *v
 		}
 	}
 
-<<<<<<< HEAD
-=======
 	*pvolume_info = volume_info;
 	return rc;
 out:
 	cifs_cleanup_volume_info(volume_info);
->>>>>>> linux-next/akpm-end
 	return rc;
 }
 
diff -puN net/bluetooth/l2cap_core.c~linux-next-git-rejects net/bluetooth/l2cap_core.c
--- a/net/bluetooth/l2cap_core.c~linux-next-git-rejects
+++ a/net/bluetooth/l2cap_core.c
@@ -2530,13 +2530,8 @@ static inline int l2cap_config_req(struc
 
 	sk = chan->sk;
 
-<<<<<<< HEAD
-	if ((bt_sk(sk)->defer_setup && sk->sk_state != BT_CONNECT2) ||
-		 (!bt_sk(sk)->defer_setup && sk->sk_state != BT_CONFIG)) {
-=======
 	if ((bt_sk(sk)->defer_setup && chan->state != BT_CONNECT2) ||
 		 (!bt_sk(sk)->defer_setup && chan->state != BT_CONFIG)) {
->>>>>>> linux-next/akpm-end
 		struct l2cap_cmd_rej rej;
 
 		rej.reason = cpu_to_le16(0x0002);
diff -puN drivers/hwmon/adm1275.c~linux-next-git-rejects drivers/hwmon/adm1275.c
--- a/drivers/hwmon/adm1275.c~linux-next-git-rejects
+++ a/drivers/hwmon/adm1275.c
@@ -50,17 +50,10 @@ static int adm1275_probe(struct i2c_clie
 	}
 
 	info->pages = 1;
-<<<<<<< HEAD
-	info->direct[PSC_VOLTAGE_IN] = true;
-	info->direct[PSC_VOLTAGE_OUT] = true;
-	info->direct[PSC_CURRENT_OUT] = true;
-	info->m[PSC_CURRENT_OUT] = 807;
-=======
 	info->format[PSC_VOLTAGE_IN] = direct;
 	info->format[PSC_VOLTAGE_OUT] = direct;
 	info->format[PSC_CURRENT_OUT] = direct;
 	info->m[PSC_CURRENT_OUT] = 800;
->>>>>>> linux-next/akpm-end
 	info->b[PSC_CURRENT_OUT] = 20475;
 	info->R[PSC_CURRENT_OUT] = -1;
 	info->func[0] = PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT;
diff -puN drivers/hwmon/pmbus_core.c~linux-next-git-rejects drivers/hwmon/pmbus_core.c
--- a/drivers/hwmon/pmbus_core.c~linux-next-git-rejects
+++ a/drivers/hwmon/pmbus_core.c
@@ -444,9 +444,6 @@ static long pmbus_reg2data_direct(struct
 	return (val - b) / m;
 }
 
-<<<<<<< HEAD
-static long pmbus_reg2data(struct pmbus_data *data, struct pmbus_sensor *sensor)
-=======
 /*
  * Convert VID sensor values to milli- or micro-units
  * depending on sensor type.
@@ -463,7 +460,6 @@ static int pmbus_reg2data_vid(struct pmb
 }
 
 static int pmbus_reg2data(struct pmbus_data *data, struct pmbus_sensor *sensor)
->>>>>>> linux-next/akpm-end
 {
 	long val;
 
_

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

origin.patch
headers_check-is-broken.patch
samples-hidraw-is-busted.patch
xtensa-prevent-arbitrary-read-in-ptrace-fix.patch
linux-next.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
cris-fix-a-build-error-in-kernel-forkc-checkpatch-fixes.patch
kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long-fix.patch
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix.patch
arch-x86-include-asm-delayh-fix-udelay-and-ndelay-for-8-bit-args.patch
drivers-net-skgec-support-dlink-dge-530t-rev-c1.patch
drivers-video-backlight-aat2870_blc-make-it-buildable-as-a-module.patch
pci-enumerate-the-pci-device-only-removed-out-pci-hierarchy-of-os-when-re-scanning-pci-fix.patch
drivers-cdrom-cdromc-relax-check-on-dvd-manufacturer-value.patch
drivers-staging-speakup-devsynthc-fix-buffer-size-is-not-provably-correct-error.patch
drivers-staging-gma500-psb_intel_displayc-fix-build.patch
drivers-staging-dt3155v4l-dt3155v4lc-needs-slabh.patch
drivers-staging-solo6x10-corec-needs-slabh.patch
drivers-staging-solo6x10-p2mc-needs-slabh.patch
staging-more-missing-slabh-inclusions.patch
slab-use-numa_no_node.patch
mm.patch
mm-extend-memory-hotplug-api-to-allow-memory-hotplug-in-virtual-machines-fix.patch
pagewalk-add-locking-rule-comments-fix.patch
mm-memoryc-remove-zap_block_size.patch
mm-memblockc-avoid-abuse-of-red_inactive.patch
mm-preallocate-page-before-lock_page-at-filemap-cow.patch
frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch
hpet-factor-timer-allocate-from-open.patch
drivers-misc-add-support-the-fsa9480-usb-switch-fix.patch
leds-route-kbd-leds-through-the-generic-leds-layer.patch
checkpatch-suggest-using-min_t-or-max_t-v2.patch
checkpatch-add-a-prefer-__aligned-check.patch
lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch
fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch
fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch
init-skip-calibration-delay-if-previously-done-fix.patch
init-skip-calibration-delay-if-previously-done-fix-fix.patch
init-skip-calibration-delay-if-previously-done-4.patch
drivers-rtc-add-support-for-qualcomm-pmic8xxx-rtc-fix.patch
memcg-consolidates-memory-cgroup-lru-stat-functions-fix.patch
cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node.patch
cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-fix-2.patch
cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-cpusets-initialize-spread-rotor-lazily-fix.patch
h8300-m68k-xtensa-__fd_isset-should-return-0-1.patch
proc-pid-fdinfo-add-cloexec-information-fix.patch
ipc-introduce-shm_rmid_forced-sysctl-fix.patch
ipc-introduce-shm_rmid_forced-sysctl-fix-2.patch
ipc-introduce-shm_rmid_forced-sysctl-cleanup.patch
ipc-introduce-shm_rmid_forced-sysctl-comments-fix.patch
ipc-introduce-shm_rmid_forced-sysctl-testing.patch
scatterlist-new-helper-functions.patch
scatterlist-new-helper-functions-update-fix.patch
kexec-remove-kmsg_dump_kexec.patch
vmware-balloon-switch-to-using-sysem-wide-freezable-workqueue-fix.patch
ramoops-use-module-parameters-instead-of-platform-data-if-not-available-checkpatch-fixes.patch
journal_add_journal_head-debug.patch
mutex-subsystem-synchro-test-module-fix.patch
slab-leaks3-default-y.patch
put_bh-debug.patch
memblock-add-input-size-checking-to-memblock_find_region.patch
memblock-add-input-size-checking-to-memblock_find_region-fix.patch