linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the pci-current tree with Linus' tree
@ 2021-11-14 22:00 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2021-11-14 22:00 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Marc Zyngier

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

Hi all,

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

  drivers/of/irq.c

between commit:

  10a20b34d735 ("of/irq: Don't ignore interrupt-controller when interrupt-map failed")

from Linus' tree and commit:

  eca2719173b5 ("Revert "of/irq: Allow matching of an interrupt-map local to an interrupt controller"")

from the pci-current tree.

I fixed it up (I just used the former) 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

* linux-next: manual merge of the pci-current tree with Linus'  tree
@ 2015-05-28  1:36 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-05-28  1:36 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-next, linux-kernel, Pratyush Anand, Jingoo Han

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

Hi Bjorn,

Today's linux-next merge of the pci-current tree got a conflict in
MAINTAINERS between commit b77017555ce5 ("MAINTAINERS: update Jingoo
Han's email address") from Linus' tree and commit 110baab1d128
("MAINTAINERS: Add Pratyush Anand as SPEAr13xx and DesignWare PCIe
maintainer") from the pci-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc MAINTAINERS
index 474bcb6c0bac,72674ba8cca5..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7575,7 -7546,8 +7575,8 @@@ S:	Maintaine
  F:	drivers/pci/host/pci-exynos.c
  
  PCI DRIVER FOR SYNOPSIS DESIGNWARE
 -M:	Jingoo Han <jg1.han@samsung.com>
 +M:	Jingoo Han <jingoohan1@gmail.com>
+ M:	Pratyush Anand <pratyush.anand@gmail.com>
  L:	linux-pci@vger.kernel.org
  S:	Maintained
  F:	drivers/pci/host/*designware*

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

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

end of thread, other threads:[~2021-11-14 22:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-14 22:00 linux-next: manual merge of the pci-current tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2015-05-28  1:36 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).