* linux-next: manual merge of the char-misc tree with the driver-core and tty trees
@ 2023-03-20 0:54 Stephen Rothwell
2023-03-20 12:15 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2023-03-20 0:54 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann
Cc: Greg Kroah-Hartman, Ilpo Järvinen, Jiri Slaby (SUSE),
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the char-misc tree with the driver-core and tty trees
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2023-03-20 12:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Ilpo Järvinen, Jiri Slaby (SUSE),
Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-20 12:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).