LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the mhi tree with the net tree
@ 2021-08-04 15:16 Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2021-08-04 15:16 UTC (permalink / raw)
  To: Manivannan Sadhasivam
  Cc: David S . Miller, Linux Kernel Mailing List,
	Linux Next Mailing List, Manivannan Sadhasivam, Loic Poulain

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)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* linux-next: manual merge of the mhi tree with the net tree
@ 2021-08-04 15:22 Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2021-08-04 15:22 UTC (permalink / raw)
  To: Manivannan Sadhasivam
  Cc: David S . Miller, Linux Kernel Mailing List,
	Linux Next Mailing List, Manivannan Sadhasivam, Loic Poulain

Hi all,

Today's linux-next merge of the mhi tree got a conflict in:

  net/qrtr/mhi.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 net/qrtr/mhi.c
index 1dc955ca57d3,29b4fa3b72ab..000000000000
--- a/net/qrtr/mhi.c
+++ b/net/qrtr/mhi.c

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-04 15:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-04 15:16 linux-next: manual merge of the mhi tree with the net tree Mark Brown
2021-08-04 15:22 Mark Brown

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).