From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Helge Deller <deller@gmx•de>,
Parisc List <linux-parisc@vger•kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Jiri Slaby <jirislaby@kernel•org>, Jiri Slaby <jslaby@suse•cz>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the tty tree with the parisc-hd tree
Date: Mon, 30 Aug 2021 15:46:05 +1000 [thread overview]
Message-ID: <20210830154605.2abe717e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 817 bytes --]
Hi all,
Today's linux-next merge of the tty tree got a conflict in:
arch/parisc/kernel/pdc_cons.c
between commit:
9613b0cb3eb4 ("tty: pdc_cons, free tty_driver upon failure")
from the parisc-hd tree and commits:
0524513afe45 ("tty: don't store semi-state into tty drivers")
72fdb403008c ("tty: pdc_cons, free tty_driver upon failure")
from the tty tree.
I fixed it up (I just used the latter version) 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:[~2021-08-30 5:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 5:46 Stephen Rothwell [this message]
2021-08-30 7:14 ` linux-next: manual merge of the tty tree with the parisc-hd tree Helge Deller
2021-08-30 7:33 ` Stephen Rothwell
2021-08-30 8:17 ` Helge Deller
-- strict thread matches above, loose matches on Subject: below --
2020-10-13 4:43 Stephen Rothwell
2017-08-29 6:38 Stephen Rothwell
2017-08-29 6:35 Stephen Rothwell
2017-08-29 6:58 ` 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=20210830154605.2abe717e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=deller@gmx$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jirislaby@kernel$(echo .)org \
--cc=jslaby@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
/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