From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752580AbdF2Dbd (ORCPT ); Wed, 28 Jun 2017 23:31:33 -0400 Received: from ozlabs.org ([103.22.144.67]:59595 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751548AbdF2Da2 (ORCPT ); Wed, 28 Jun 2017 23:30:28 -0400 Date: Thu, 29 Jun 2017 13:30:15 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Joerg Roedel Cc: Linux-Next Mailing List , Linux Kernel Mailing List , David Daney , Linu Cherian , Will Deacon , Geetha Sowjanya Subject: linux-next: manual merge of the kvm-arm tree with the iommu tree Message-ID: <20170629133015.5330f0ca@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | | | | | |