From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"J. German Rivera" <German.Rivera@freescale•com>,
Qais Yousef <qais.yousef@imgtec•com>
Subject: linux-next: manual merge of the staging tree with the tip tree
Date: Wed, 2 Mar 2016 14:35:06 +1100 [thread overview]
Message-ID: <20160302143506.5f75d279@canb.auug.org.au> (raw)
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,
};
/**
next reply other threads:[~2016-03-02 3:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 3:35 Stephen Rothwell [this message]
2016-03-02 7:54 ` linux-next: manual merge of the staging tree with the tip tree Thomas Gleixner
2016-03-02 17:43 ` Greg KH
2016-03-02 17:53 ` Jose Rivera
-- strict thread matches above, loose matches on Subject: below --
2015-08-13 4:55 Stephen Rothwell
2015-08-13 15:34 ` Greg KH
2011-10-12 5:34 Stephen Rothwell
2011-10-12 14:53 ` Greg KH
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=20160302143506.5f75d279@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=German.Rivera@freescale$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=qais.yousef@imgtec$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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