From: Mark Brown <broonie@kernel.org>
To: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: "David S . Miller" <davem@davemloft.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Manivannan Sadhasivam <mani@kernel.org>,
Loic Poulain <loic.poulain@linaro.org>
Subject: linux-next: manual merge of the mhi tree with the net tree
Date: Wed, 4 Aug 2021 16:16:34 +0100 [thread overview]
Message-ID: <20210804151634.35887-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the mhi tree got conflicts in:
drivers/bus/mhi/core/main.c
between commit:
ce78ffa3ef16 ("net: really fix the build...")
from the net tree and commit:
51caa4ed8542 ("bus: mhi: Add inbound buffers allocation flag")
from the mhi tree.
I fixed it up (see below) 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.
diff --cc drivers/bus/mhi/core/main.c
index 84448233f64c,c67fd001ded1..000000000000
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
(the net tree added a blank line 1460 with a tab and the mhi tree adds
the same line with no tab)
next reply other threads:[~2021-08-04 15:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 15:16 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-04 15:22 linux-next: manual merge of the mhi tree with the net tree Mark Brown
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=20210804151634.35887-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=mani@kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
/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