linux-next: manual merge of the tty tree with the qcom tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  drivers/tty/serial/qcom_geni_serial.c

between commit:

  650c8bd36a66 ("serial: qcom_geni_serial: Always use 4 bytes per TX FIFO word")

from the qcom tree and commit:

  3550f8979a7b ("tty: serial: qcom_geni_serial: Clean up an ARRAY_SIZE() vs sizeof()")

from the tty tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/tty/serial/qcom_geni_serial.c
index 07b7b6b05b8b,1ed3d354e16d..000000000000
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@@ -768,8 -718,8 +768,8 @@@ static void qcom_geni_serial_handle_tx(
  		u8 buf[sizeof(u32)];
  		int c;
  
- 		memset(buf, 0, ARRAY_SIZE(buf));
+ 		memset(buf, 0, sizeof(buf));
 -		tx_bytes = min_t(size_t, remaining, port->tx_bytes_pw);
 +		tx_bytes = min_t(size_t, remaining, BYTES_PER_FIFO_WORD);
  
  		for (c = 0; c < tx_bytes ; c++) {
  			buf[c] = xmit->buf[tail++];

Attachment: pgpMiOACVgoqX.pgp
Description: OpenPGP digital signature