From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Arnd Bergmann <arnd@arndb•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Phillip Potter <phil@philpotter•co.uk>
Subject: Re: linux-next: manual merge of the net-next tree with the iio-fixes, staging trees
Date: Thu, 2 Sep 2021 11:30:04 +0200 [thread overview]
Message-ID: <YTCZnBBnG6HcI5TB@kroah.com> (raw)
In-Reply-To: <20210830154618.204ac5c8@canb.auug.org.au>
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
prev parent reply other threads:[~2021-09-02 9:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 5:46 linux-next: manual merge of the net-next tree with the iio-fixes, staging trees Stephen Rothwell
2021-09-02 9:30 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YTCZnBBnG6HcI5TB@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=phil@philpotter$(echo .)co.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox