All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christoffer Dall <cdall@cs.columbia.edu>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Joerg Roedel <joro@8bytes.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	David Daney <david.daney@cavium.com>,
	Linu Cherian <linu.cherian@cavium.com>,
	Will Deacon <will.deacon@arm.com>,
	Geetha Sowjanya <geethasowjanya.akula@cavium.com>
Subject: linux-next: manual merge of the kvm-arm tree with the iommu tree
Date: Thu, 29 Jun 2017 13:30:15 +1000	[thread overview]
Message-ID: <20170629133015.5330f0ca@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  Documentation/arm64/silicon-errata.txt

between commits:

  e5b829de053d ("iommu/arm-smmu-v3: Add workaround for Cavium ThunderX2 erratum #74")
  f935448acf46 ("iommu/arm-smmu-v3: Add workaround for Cavium ThunderX2 erratum #126")

from the iommu tree and commit:

  690a341577f9 ("arm64: Add workaround for Cavium Thunder erratum 30115")

from the kvm-arm tree.

I fixed it up (see below) 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

diff --cc Documentation/arm64/silicon-errata.txt
index 856479525776,f5f93dca54b7..000000000000
--- a/Documentation/arm64/silicon-errata.txt
+++ b/Documentation/arm64/silicon-errata.txt
@@@ -62,8 -62,7 +62,9 @@@ stable kernels
  | Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154        |
  | Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456        |
  | Cavium         | ThunderX SMMUv2 | #27704          | N/A                         |
+ | Cavium         | ThunderX Core   | #30115          | CAVIUM_ERRATUM_30115        |
 +| Cavium         | ThunderX2 SMMUv3| #74             | N/A                         |
 +| Cavium         | ThunderX2 SMMUv3| #126            | N/A                         |
  |                |                 |                 |                             |
  | Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585         |
  |                |                 |                 |                             |

                 reply	other threads:[~2017-06-29  3:31 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20170629133015.5330f0ca@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=cdall@cs.columbia.edu \
    --cc=david.daney@cavium.com \
    --cc=geethasowjanya.akula@cavium.com \
    --cc=joro@8bytes.org \
    --cc=linu.cherian@cavium.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=will.deacon@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.