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

Message-ID: <YTCZnBBnG6HcI5TB@kroah.com>
Date:   Thu, 2 Sep 2021 11:30:04 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Jonathan Cameron <Jonathan.Cameron@...wei.com>,
        Arnd Bergmann <arnd@...db.de>,
        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: Re: linux-next: manual merge of the net-next tree with the
 iio-fixes, staging trees

On Mon, Aug 30, 2021 at 03:46:18PM +1000, Stephen Rothwell wrote:
> 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



Should all now be resolved in Linus's tree.

thanks,

greg k-h