From: Petr Mladek <pmladek@suse.com>
To: Mark Brown <broonie@kernel.org>
Cc: Greg KH <greg@kroah.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Tony Lindgren <tony.lindgren@linux.intel.com>
Subject: Re: linux-next: manual merge of the tty tree with the printk tree
Date: Tue, 25 Jun 2024 11:32:16 +0200 [thread overview]
Message-ID: <ZnqOoGjy7nAiV4MW@pathway.suse.cz> (raw)
In-Reply-To: <ZnmwwfMH50s9LiT5@sirena.org.uk>
On Mon 2024-06-24 18:45:37, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> drivers/tty/serial/8250/8250_core.c
>
> between commit:
>
> b70dc67cceb97 ("serial: core: Revert unusable console quirk handling")
I have just removed this commit from the printk tree.
> from the printk tree and commit:
>
> ffd8e8bd26e94 ("serial: 8250: Extract platform driver")
>
> from the tty tree.
There has been a race between the changes in the printk and tty
which has caused these problems. [*]
The conflicts between the printk and tty tree should be gone now.
I am sorry for troubles.
Best Regards,
Petr
[*] In fact, I have removed the entire patchset fixing the regression
in console registration, see
https://lore.kernel.org/r/20240620124541.164931-1-tony.lindgren@linux.intel.com
The feature is going to be reworked. Greg has reverted the commits
introducing the regression in the tty tree, see
https://lore.kernel.org/r/2024062551-hubcap-bauble-fae5@gregkh
prev parent reply other threads:[~2024-06-25 9:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 17:45 linux-next: manual merge of the tty tree with the printk tree Mark Brown
2024-06-25 9:32 ` Petr Mladek [this message]
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=ZnqOoGjy7nAiV4MW@pathway.suse.cz \
--to=pmladek@suse.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tony.lindgren@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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