From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Jiri Slaby (SUSE)" <jirislaby@kernel.org>,
"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 char-misc tree with the driver-core and tty trees
Date: Mon, 20 Mar 2023 13:15:24 +0100 [thread overview]
Message-ID: <ZBhOXGb7ukVyqJD9@kroah.com> (raw)
In-Reply-To: <20230320115430.06f26c33@canb.auug.org.au>
On Mon, Mar 20, 2023 at 11:54:30AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got conflicts in:
>
> drivers/char/pcmcia/cm4000_cs.c
> drivers/char/pcmcia/cm4040_cs.c
> drivers/char/pcmcia/scr24x_cs.c
> drivers/char/pcmcia/synclink_cs.c
>
> between commits:
>
> 1aaba11da9aa ("driver core: class: remove module * from class_create()")
> 035173c91c6b ("tty: Convert hw_stopped in tty_struct to bool")
>
> from the driver-core, tty trees and commit:
>
> 9b12f050c76f ("char: pcmcia: remove all the drivers")
>
> from the char-misc tree.
>
> I fixed it up (I removed the files) 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.
Removing the files is good, thanks!
greg k-h
prev parent reply other threads:[~2023-03-20 12:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 0:54 linux-next: manual merge of the char-misc tree with the driver-core and tty trees Stephen Rothwell
2023-03-20 12:15 ` Greg KH [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=ZBhOXGb7ukVyqJD9@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).