linux-next: manual merge of the akpm tree with the spi tree

linux-next: manual merge of the akpm tree with the spi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1108 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/spi/spi.c between commit 513273538a6c ("spi: Make max_tx and
max_rx the same type") from the spi tree and commit "drivers/spi/spi.c:
fix max() warning" from the akpm tree.

I fixed it up (I used the version from the akpm tree giving the patch
below) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index a7c3691456dd..99bc9c513b70 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -644,12 +644,11 @@ static int spi_map_msg(struct spi_master *master, struct spi_message *msg)
 	struct device *tx_dev, *rx_dev;
 	struct spi_transfer *xfer;
 	void *tmp;
-	unsigned int max_tx, max_rx;
 	int ret;
 
 	if (master->flags & (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX)) {
-		max_tx = 0;
-		max_rx = 0;
+		unsigned max_tx = 0;
+		unsigned max_rx = 0;
 
 		list_for_each_entry(xfer, &msg->transfers, transfer_list) {
 			if ((master->flags & SPI_MASTER_MUST_TX) &&

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]