linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20230320115430.06f26c33@canb.auug.org.au>
Date:   Mon, 20 Mar 2023 11:54:30 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        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: linux-next: manual merge of the char-misc tree with the driver-core
 and tty trees

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

Content of type "application/pgp-signature" skipped