Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1347759
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the staging tree with the tip tree |
| Date | 2016-03-02 04:40 +0100 |
| Message-ID | <r85NL-1Xc-3@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
include/linux/irqdomain.h
between commit:
29d5c8db26ad ("genirq: Add DOMAIN_BUS_IPI")
from the tip tree and commit:
9b1b282ccd81 ("irqdomain: Added domain bus token DOMAIN_BUS_FSL_MC_MSI")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc include/linux/irqdomain.h
index ed48594e96d2,0934d06c8b00..000000000000
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@@ -74,7 -74,7 +74,8 @@@ enum irq_domain_bus_token
DOMAIN_BUS_PCI_MSI,
DOMAIN_BUS_PLATFORM_MSI,
DOMAIN_BUS_NEXUS,
+ DOMAIN_BUS_IPI,
+ DOMAIN_BUS_FSL_MC_MSI,
};
/**
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
linux-next: manual merge of the staging tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-02 04:40 +0100
Re: linux-next: manual merge of the staging tree with the tip tree Thomas Gleixner <tglx@linutronix.de> - 2016-03-02 09:00 +0100
Re: linux-next: manual merge of the staging tree with the tip tree Greg KH <greg@kroah.com> - 2016-03-02 18:50 +0100
RE: linux-next: manual merge of the staging tree with the tip tree Jose Rivera <german.rivera@nxp.com> - 2016-03-02 20:30 +0100
csiph-web