linux-kernel - Re: linux-next: manual merge of the char-misc tree with the driver-core and tty trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 20 Mar 2023 13:15:24 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
        "Jiri Slaby (SUSE)" <jirislaby@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 driver-core and tty trees

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