From patchwork Tue Mar 13 03:11:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10277735 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 8DC136038F for ; Tue, 13 Mar 2018 03:12:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AA4F28980 for ; Tue, 13 Mar 2018 03:12:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EDB1289B8; Tue, 13 Mar 2018 03:12:23 +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 A158728980 for ; Tue, 13 Mar 2018 03:12:21 +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=I/viH8CGLo6EGjFoT4TXia1CTGLbgnterPNjiF2F3I4=; b=aw4 NKmyLZmy6lqmoxZ/wuvlaM0eQTO+Z+2k1/sV8dWSiLfk240MOLH5SlHZ4WWY2GpFzks9fCrM898U2 u9F/ecFZ/FIslhjJIa2Vt7Anj6ATb1kXvL5iAB8WNHxSZ8/oJWejfMsywj1GYZe/+Qc4JKbnsDyP9 3KL8MyrKDAE7jEKNE0PwUUlD7yuhWVW4WT1T5VYwkO3yGkBREBU/iviqWay/Eb4eDUdX1mRQKpLo5 X6/zpU3R6k2exJG7AaWaOeWgJk6+gtWrOja6TcbbQ2VwLUaZkY+1hmpf692ft46nfuOuw/RdtgF6P C+4OnPCcO92WH27bNBx1hk3jkEUR8Zg==; 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 1evaMG-0004fS-Fz; Tue, 13 Mar 2018 03:12:12 +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 1evaMD-0004cq-NP for linux-arm-kernel@lists.infradead.org; Tue, 13 Mar 2018 03:12:11 +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 400fyl67Swz9sT9; Tue, 13 Mar 2018 14:11:43 +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=1520910709; bh=BL0dMU/hOBiqZ4IWTrHNJ8rXcTXqTfn15v9CTCqpnc4=; h=Date:From:To:Cc:Subject:From; b=BaJGTtLNPKBxegZ2541utP3hsRU3Ew2t88R6EZUjo4WI34wnydgA0IYc4idsgGxel bAEUoU/UZlrBdtFIZ3ldP91Hdj6UbmJ5I6lMlIg23IPh55lqv4ajqVW5rJccmQYpWr nrRy+/MzLe42b2KQvYz2FGgxf9vDZf9mFLTq1tsTX+vybpJ2pq+ODQxpuLLW6AP0qW trwMNeq+oE9ct2GytoHI2yR8TjsjlxkTDWtr17fArbcP6/M/23xUkn64TGFfykRbHR H4uirA0uhq/JcizeUoGBiaBGE2f36jIzq1nBTGmXl+5rebI1kis7hg6fapEvISTrcF FAzrvxU5+AdQQ== Date: Tue, 13 Mar 2018 14:11:18 +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: <20180313141118.41cd6419@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180312_201210_098513_0E66F2F1 X-CRM114-Status: GOOD ( 15.42 ) 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: 8343aae66167 ("perf/core: Remove perf_event::group_entry") from the tip tree. I fixed it up (I have 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: Tue, 13 Mar 2018 14:08:01 +1100 Subject: [PATCH] perf/core: 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 67a74c48c7c2..192d23b760a0 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, group_entry) { + list_for_each_entry(sibling, &leader->sibling_list, sibling_list) { if (!validate_event(event->pmu, &fake_pmu, sibling)) return -EINVAL; }