linux-kernel - linux-next: manual merge of the rpmsg tree with the origin 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: <20230426144354.87429-1-broonie@kernel.org>
Date:   Wed, 26 Apr 2023 15:43:54 +0100
From:   broonie@...nel.org
To:     Bjorn Andersson <bjorn.andersson@...aro.org>,
        Mathieu Poirier <mathieu.poirier@...aro.org>
Cc:     Bjorn Andersson <andersson@...nel.org>,
        Bjorn Andersson <quic_bjorande@...cinc.com>,
        Chris Lew <quic_clew@...cinc.com>,
        Deepak Kumar Singh <quic_deesin@...cinc.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sarannya S <quic_sarannya@...cinc.com>
Subject: linux-next: manual merge of the rpmsg tree with the origin tree

Hi all,

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

  drivers/rpmsg/qcom_glink_native.c

between commit:

  0a7eee89e79eb ("rpmsg: glink: Transition intent request signaling to wait queue")

from the origin tree and commit:

  96a7a78517751 ("rpmsg: glink: Add support to handle signals command")

from the rpmsg 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.

diff --cc drivers/rpmsg/qcom_glink_native.c
index 1beb40a1d3df2,208a5e9443cb9..0000000000000
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c