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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20200715142539.4a3b34c6@canb.auug.org.au>
Date:   Wed, 15 Jul 2020 14:25:39 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Andy Gross <agross@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Dan Carpenter <dan.carpenter@...cle.com>,
        Douglas Anderson <dianders@...omium.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>
Subject: linux-next: manual merge of the tty tree with the qcom tree

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++];

Content of type "application/pgp-signature" skipped