linux-kernel - linux-next: manual merge of the net-next tree with the iio-fixes, staging 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: <20210830154618.204ac5c8@canb.auug.org.au>
Date:   Mon, 30 Aug 2021 15:46:18 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>, Greg KH <greg@...ah.com>,
        Jonathan Cameron <Jonathan.Cameron@...wei.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Phillip Potter <phil@...lpotter.co.uk>
Subject: linux-next: manual merge of the net-next tree with the iio-fixes,
 staging trees

Hi all,

Today's linux-next merge of the net-next tree got conflicts in:

  drivers/staging/rtl8188eu/include/osdep_intf.h
  drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
  drivers/staging/rtl8188eu/os_dep/os_intfs.c

between commit:

  55dfa29b43d2 ("staging: rtl8188eu: remove rtl8188eu driver from staging dir")

from the iio-fixes, staging trees and commit:

  89939e890605 ("staging: rtlwifi: use siocdevprivate")

from the net-next tree.

I fixed it up (I have removed these 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