From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Joerg Roedel <jroedel@suse.de>
Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree
Date: Mon, 18 Jun 2018 13:48:49 +1000 [thread overview]
Message-ID: <20180618134849.70831fe2@canb.auug.org.au> (raw)
In-Reply-To: <20180612104607.69f6f15b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
Hi all,
On Tue, 12 Jun 2018 10:46:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
>
> drivers/iommu/amd_iommu.c
>
> between commit:
>
> 94c793accacd ("iommu/amd: Hide unused iommu_table_lock")
>
> from Linus' tree and commit:
>
> 1df9bb146146 ("EXP iommu: Placeholder for fix in mainline")
>
> from the rcu tree.
I am still getting this.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-06-18 3:48 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 0:46 linux-next: manual merge of the rcu tree with Linus' tree Stephen Rothwell
2018-06-12 1:01 ` Paul E. McKenney
2018-06-18 3:48 ` Stephen Rothwell [this message]
2018-06-18 3:49 ` Stephen Rothwell
2018-06-18 14:48 ` Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2022-10-17 22:41 Stephen Rothwell
2022-10-18 18:38 ` Paul E. McKenney
2022-07-08 4:12 Stephen Rothwell
2022-07-08 15:23 ` Paul E. McKenney
2018-05-14 3:46 Stephen Rothwell
2018-05-15 17:44 ` Paul E. McKenney
2017-09-26 3:00 Stephen Rothwell
2017-09-26 3:26 ` Paul E. McKenney
2017-09-26 3:42 ` Stephen Rothwell
2017-03-08 0:46 Stephen Rothwell
2017-03-08 0:56 ` Stephen Rothwell
2016-03-30 0:32 Stephen Rothwell
2016-03-30 10:30 ` Paul E. McKenney
2016-03-30 0:23 Stephen Rothwell
2012-11-29 3:06 Stephen Rothwell
2012-11-29 22:12 ` Paul E. McKenney
2012-08-06 2:31 Stephen Rothwell
2011-09-27 6:04 Stephen Rothwell
2011-09-27 12:20 ` Frederic Weisbecker
2011-09-27 5:14 Stephen Rothwell
2011-09-27 13:14 ` Borislav Petkov
2010-10-06 2:38 Stephen Rothwell
2010-10-06 4:17 ` Paul E. McKenney
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=20180618134849.70831fe2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).