archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the hwmon-staging tree with the mips tree
@ 2019-07-31  1:35 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-07-31  1:35 UTC (permalink / raw)
  To: Guenter Roeck, Ralf Baechle, James Hogan
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Paul Cercueil, Stephen Boyd

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

Hi all,

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


between commit:

  d202742058b2 ("hwmon: Drop obsolete JZ4740 driver")

from the mips tree and commit:

  8d91bfd06bc1 ("hwmon: Remove dev_err() usage after platform_get_irq()")

from the hwmon-staging tree.

I fixed it up (I just removed the file) 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.

Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-07-31  1:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-31  1:35 linux-next: manual merge of the hwmon-staging tree with the mips tree Stephen Rothwell

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