From: Mark Brown <broonie@kernel.org>
To: Greg KH <greg@kroah.com>
Cc: "David S . Miller" <davem@davemloft.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Phillip Potter <phil@philpotter.co.uk>
Subject: linux-next: manual merge of the staging tree with the net-next tree
Date: Tue, 3 Aug 2021 00:33:39 +0100 [thread overview]
Message-ID: <20210802233339.25285-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the staging tree got conflicts in:
drivers/staging/r8188eu/include/rtw_android.h
drivers/staging/r8188eu/os_dep/rtw_android.c
between commit:
89939e890605 ("staging: rtlwifi: use siocdevprivate")
from the net-next tree and commit:
2b42bd58b321 ("staging: r8188eu: introduce new os_dep dir for RTL8188eu driver")
from the staging tree.
I fixed it up using the net-next version 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.
next reply other threads:[~2021-08-02 23:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 23:33 Mark Brown [this message]
2021-08-03 8:57 ` linux-next: manual merge of the staging tree with the net-next tree Phillip Potter
2021-08-03 9:23 ` Arnd Bergmann
2021-08-09 7:55 ` Stephen Rothwell
2021-08-09 12:46 ` Phillip Potter
2021-08-09 20:00 ` Arnd Bergmann
2021-08-09 21:45 ` Phillip Potter
-- strict thread matches above, loose matches on Subject: below --
2023-10-23 3:47 Stephen Rothwell
2023-10-23 7:27 ` Greg KH
2019-02-28 4:52 Stephen Rothwell
2019-02-28 7:04 ` Greg KH
2018-03-15 7:35 Stephen Rothwell
2016-12-07 4:04 Stephen Rothwell
2016-12-07 7:02 ` Greg KH
2016-11-24 3:42 Stephen Rothwell
2016-10-21 1:21 Stephen Rothwell
2014-07-16 6:43 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-05-28 8:28 Stephen Rothwell
2014-05-28 15:49 ` Greg KH
2014-03-27 5:09 Stephen Rothwell
2014-03-27 19:14 ` Eric W. Biederman
2014-03-17 8:08 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2013-05-29 4:14 Stephen Rothwell
2013-05-29 8:03 ` Greg KH
2013-01-23 4:45 Stephen Rothwell
2013-01-23 4:52 ` Greg KH
2011-10-25 8:26 Stephen Rothwell
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=20210802233339.25285-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).