From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Yury Norov <yury.norov@gmail•com>, Greg KH <greg@kroah•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Hugo Villeneuve <hvilleneuve@dimonoff•com>,
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 bitmap tree with the tty tree
Date: Mon, 8 Jan 2024 14:36:27 +1100 [thread overview]
Message-ID: <20240108143627.29ac91fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 909 bytes --]
Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
drivers/tty/serial/sc16is7xx.c
between commits:
8a1060ce9749 ("serial: sc16is7xx: fix invalid sc16is7xx_lines bitfield in case of probe error")
3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by using one regmap per port")
from the tty tree and commit:
e63a961be48f ("serial: sc12is7xx: optimize sc16is7xx_alloc_line()")
from the bitmap tree.
I fixed it up (the former removed the function updated by the latter) 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:[~2024-01-08 3:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-08 3:36 Stephen Rothwell [this message]
2024-01-08 7:53 ` linux-next: manual merge of the bitmap tree with the tty tree Greg KH
2024-01-08 16:51 ` Hugo Villeneuve
2024-01-11 14:39 ` Yury Norov
2024-01-17 8:14 ` Greg KH
2024-01-17 8:49 ` Stephen Rothwell
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=20240108143627.29ac91fe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hvilleneuve@dimonoff$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=yury.norov@gmail$(echo .)com \
/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