* linux-next: manual merge of the net-next tree with the iio-fixes, staging trees
@ 2021-08-30 5:46 Stephen Rothwell
2021-09-02 9:30 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-08-30 5:46 UTC (permalink / raw)
To: David Miller, Networking, Greg KH, Jonathan Cameron
Cc: Arnd Bergmann, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Phillip Potter
[-- Attachment #1: Type: text/plain, Size: 890 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the iio-fixes, staging trees
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2021-09-02 9:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Jonathan Cameron, Arnd Bergmann,
Linux Kernel Mailing List, Linux Next Mailing List,
Phillip Potter
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-02 9:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).