From: Michael Ellerman <mpe@ellerman•id.au>
To: Joerg Roedel <joro@8bytes•org>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org,
"linux-kernel@vger•kernel.org Jiang Liu"
<jiang.liu@linux•intel.com>, Joerg Roedel <jroedel@suse•de>,
Feng Wu <feng.wu@intel•com>
Subject: Re: linux-next: manual merge of the tip tree with the iommu tree
Date: Thu, 18 Jun 2015 07:15:08 +1000 [thread overview]
Message-ID: <1434575708.21460.0.camel@ellerman.id.au> (raw)
In-Reply-To: <20150617095751.GB27750@8bytes.org>
On Wed, 2015-06-17 at 11:57 +0200, Joerg Roedel wrote:
> Hi Michael,
>
> On Wed, Jun 17, 2015 at 01:22:54PM +1000, Michael Ellerman wrote:
> > Today's linux-next merge of the tip tree got conflicts in:
> >
> > drivers/iommu/intel_irq_remapping.c
> > drivers/iommu/dmar.c
> >
> > between commits:
> >
> > af3b358e4811 "iommu/vt-d: Copy IR table from old kernel when in kdump mode"
> > 23256d0b3500 "iommu/vt-d: Move EIM detection to intel_prepare_irq_remapping"
> > 9f10e5bf62f7 "iommu/vt-d: Cleanup log messages"
> >
> > from the iommu tree and commits:
> >
> > 8dedf4cf5a52 "irq_remapping/vt-d: Change prototypes to prepare for hierarchical irqdomain"
> > b106ee63abcc "irq_remapping/vt-d: Enhance Intel IR driver to support hierarchical irqdomains"
> > 3d9b98f4ec17 "iommu, x86: Setup Posted-Interrupts capability for Intel iommu"
> > 3c6e567509ed "irq_remapping/vt-d: Clean up unsued code"
> > 34742db8eaf9 "iommu/vt-d: Refine the interfaces to create IRQ for DMAR unit"
> >
> > from the tip tree.
> >
> > Or something like that, it was a bit of a mess. Given the size of the conflict
> > I doubt I got it right, but it does seem to build.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Sorry for the hassle, but your conflict resolution looks good. I tried a
> merge between tip/x86/apic and iommu/next myself and solved the
> conflicts. The results look quite similar to yours (not sure why I got
> conflicts in unrelated files):
Thanks for checking.
cheers
next prev parent reply other threads:[~2015-06-17 21:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 3:22 linux-next: manual merge of the tip tree with the iommu tree Michael Ellerman
2015-06-17 9:57 ` Joerg Roedel
2015-06-17 21:15 ` Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-03 4:36 Stephen Rothwell
2023-04-03 5:11 ` Stephen Rothwell
2022-11-14 4:10 Stephen Rothwell
2022-03-07 1:50 Stephen Rothwell
2021-10-21 1:35 Stephen Rothwell
2021-10-21 15:29 ` Borislav Petkov
2021-11-02 2:57 ` Stephen Rothwell
2020-10-02 5:22 Stephen Rothwell
2020-10-13 3:38 ` Stephen Rothwell
2017-08-22 3:50 Stephen Rothwell
2017-08-22 5:57 ` Baoquan He
2017-08-22 7:49 ` Stephen Rothwell
2017-08-22 8:01 ` Baoquan He
2017-08-22 8:43 ` Stephen Rothwell
2017-08-22 8:50 ` Baoquan He
2017-08-22 8:11 ` Baoquan He
2017-08-23 14:15 ` Tom Lendacky
2017-09-04 5:45 ` Stephen Rothwell
2015-06-09 6:57 Stephen Rothwell
2015-06-09 6:57 Stephen Rothwell
[not found] <20150605085030.17051140293@ozlabs.org>
2015-06-05 8:57 ` Joerg Roedel
2011-09-27 5:03 Stephen Rothwell
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=1434575708.21460.0.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=feng.wu@intel$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jiang.liu@linux$(echo .)intel.com \
--cc=joro@8bytes$(echo .)org \
--cc=jroedel@suse$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--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