From patchwork Mon Mar 19 03:06:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10291625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5854460291 for ; Mon, 19 Mar 2018 03:08:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 443EB28C27 for ; Mon, 19 Mar 2018 03:08:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3801428C94; Mon, 19 Mar 2018 03:08:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C6F5028C27 for ; Mon, 19 Mar 2018 03:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=lY/XzmeGMEd4oPIyt/fADhEOR47Bq4PelzNq5L8+v6I=; b=mY8 Ht4Ck0vUkJbT5flmQhnDsPV/h0lnHrWb9J5As1YbDHBXKSCxcsWLaCmE6hknqxQIX6hGuMPOCFFo+ UTrvAHf1hMc26By6dJ+j58F6P+WgcLM11j2zRSirySA8ckTptcZXbb6QyjA3Jz3nDf90kZwhPESDk 4TUCkOV62fayZbSwjo0XMBwP3Irp++qoVQs9IDUGmxfOr0SUwKDNkwVo9P7zHXfH8vQPy31B0Ttc5 upHMgNwVWYwZnfAJNwQ7sdXw6X9s6nYnB+sHarc1hkOk3bKI3Ft0RGoqxeez2Z7GqyMmpgIt3mB1e IDps0jO3ORuJ2QrNT9ZFWsNz+PNJHPA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1exl9P-0001VD-Vk; Mon, 19 Mar 2018 03:07:55 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1exl9L-0001TH-Ir for linux-arm-kernel@lists.infradead.org; Mon, 19 Mar 2018 03:07:53 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 404Lb80r1xz9s5N; Mon, 19 Mar 2018 14:07:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1521428856; bh=LBIWZKtUqqKfIYzaAtolbLhYDaBxK2lwmYcYo+cTIHM=; h=Date:From:To:Cc:Subject:From; b=ef0RWfLoORumn+mYeHnvRH3qwMVGONmkcplsY0LgP7mP/vhkSqyWeJdncSMAcWkG0 B+MrpqYp+b1HLPxTLV4wqv+yGI0vY+NJXgwhDXzbrn1hCipQFnXNe58Q/KcqnxSLTN Pm56hpea+JwBia/QWtW3XWhYjWIl8/9jHv9ttQd1lRe3hDJwj3427FJxQGV6Pk7Me0 mdCbxY5ADgOxUMVzPWftgp196Nifc1Hdo26NNgotzJ9zWWvn471r9cZylz6GL4rUGi 6V7Y/CjcTAQloGVk8niebfle5UMygL9BzXPZSFldnuCftSqZDyoFh1n/+dildjqztN xg7sjqRZCVd9Q== Date: Mon, 19 Mar 2018 14:06:57 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the tip tree with the arm-soc tree Message-ID: <20180319140657.223852a1@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180318_200751_792089_EB5B404E X-CRM114-Status: GOOD ( 16.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux-Next Mailing List , Robin Murphy , Linux Kernel Mailing List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/bus/arm-cci.c between commit: 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver") from the arm-soc tree and commit: edb39592a587 ("perf: Fix sibling iteration") from the tip tree. I fixed it up (I added the following merge fix patch) 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. From: Stephen Rothwell Date: Mon, 19 Mar 2018 14:04:52 +1100 Subject: [PATCH] perf/core: another merge fix for "drivers/bus: Split Arm CCI driver" Signed-off-by: Stephen Rothwell --- drivers/perf/arm-cci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c index 192d23b760a0..383b2d3dcbc6 100644 --- a/drivers/perf/arm-cci.c +++ b/drivers/perf/arm-cci.c @@ -1265,7 +1265,7 @@ static int validate_group(struct perf_event *event) if (!validate_event(event->pmu, &fake_pmu, leader)) return -EINVAL; - list_for_each_entry(sibling, &leader->sibling_list, sibling_list) { + for_each_sibling_event(sibling, leader) { if (!validate_event(event->pmu, &fake_pmu, sibling)) return -EINVAL; }