linux-kernel - linux-next: manual merge of the tty tree with the powerpc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20231127114904.77f7efb6@canb.auug.org.au>
Date:   Mon, 27 Nov 2023 11:49:04 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Michael Ellerman <mpe@...erman.id.au>
Cc:     PowerPC <linuxppc-dev@...ts.ozlabs.org>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>
Subject: linux-next: manual merge of the tty tree with the powerpc tree

Hi all,

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

  drivers/tty/hvc/hvc_console.h

between commit:

  c9e38dc90e1c ("tty: hvc: Make hvc_remove() return no value")

from the powerpc tree and commit:

  7f30c19caf94 ("tty: hvc: Make hvc_remove() return no value")

from the tty tree.

These are slightly different versions of the same patch.

I fixed it up (I used the former version (removed "extern" from a function
declaration)) 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

Content of type "application/pgp-signature" skipped