From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Michael Ellerman <mpe@ellerman•id.au>
Cc: PowerPC <linuxppc-dev@lists•ozlabs.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
Subject: linux-next: manual merge of the tty tree with the powerpc tree
Date: Mon, 27 Nov 2023 11:49:04 +1100 [thread overview]
Message-ID: <20231127114904.77f7efb6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 851 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-11-27 0:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 0:49 Stephen Rothwell [this message]
2023-11-27 11:00 ` linux-next: manual merge of the tty tree with the powerpc tree Michael Ellerman
2023-11-27 11:17 ` Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2023-08-18 4:58 Stephen Rothwell
2023-08-22 11:51 ` Greg KH
2023-08-23 6:08 ` Michael Ellerman
2011-09-21 5:01 Stephen Rothwell
2011-09-21 14:06 ` Greg KH
2011-09-21 4:50 Stephen Rothwell
2011-09-21 14:06 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231127114904.77f7efb6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox