From: Greg KH <greg@kroah•com>
To: Yury Norov <yury.norov@gmail•com>
Cc: Hugo Villeneuve <hugo@hugovil•com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Hugo Villeneuve <hvilleneuve@dimonoff•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the bitmap tree with the tty tree
Date: Wed, 17 Jan 2024 09:14:57 +0100 [thread overview]
Message-ID: <2024011734-subside-attach-53ea@gregkh> (raw)
In-Reply-To: <CAAH8bW-eLNebwabvvJeos4XbB77p4vGsutkwGtKMxR5-HpzTDA@mail.gmail.com>
On Thu, Jan 11, 2024 at 06:39:49AM -0800, Yury Norov wrote:
> On Mon, Jan 8, 2024 at 8:52 AM Hugo Villeneuve <hugo@hugovil•com> wrote:
> >
> > On Mon, 8 Jan 2024 08:53:40 +0100
> > Greg KH <greg@kroah•com> wrote:
> >
> > > On Mon, Jan 08, 2024 at 02:36:27PM +1100, Stephen Rothwell wrote:
> > > > 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.
> > >
> > > Fix looks coks correct, thanks.
> >
> > Yes, I confirm patch:
> > e63a961be48f ("serial: sc12is7xx: optimize sc16is7xx_alloc_line()")
> >
> > is now obsoleted by patch:
> > 8a1060ce9749 ("serial: sc16is7xx: fix invalid sc16is7xx_lines
> > bitfield in case of probe error")
>
> Hi guys,
>
> I've already sent a pull request that includes the e63a961be48f. If I'll have to
> re-send it, I'll exclude the obsolete patch. Otherwise, can you adjust the
> 8a1060ce9749?
We can not "adjust" anything, as I can't rebase a public tree, sorry.
greg k-h
next prev parent reply other threads:[~2024-01-17 8:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-08 3:36 linux-next: manual merge of the bitmap tree with the tty tree Stephen Rothwell
2024-01-08 7:53 ` Greg KH
2024-01-08 16:51 ` Hugo Villeneuve
2024-01-11 14:39 ` Yury Norov
2024-01-17 8:14 ` Greg KH [this message]
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=2024011734-subside-attach-53ea@gregkh \
--to=greg@kroah$(echo .)com \
--cc=hugo@hugovil$(echo .)com \
--cc=hvilleneuve@dimonoff$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--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