From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the tip tree with the arm-soc tree Date: Tue, 13 Mar 2018 14:11:18 +1100 Message-ID: <20180313141118.41cd6419@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/62QK8zv9iQLslRFcHWl.Fux"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Olof Johansson , Arnd Bergmann , ARM Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Robin Murphy List-Id: linux-next.vger.kernel.org --Sig_/62QK8zv9iQLslRFcHWl.Fux Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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 drive= r" 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; =20 - 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; } --=20 2.16.1 --=20 Cheers, Stephen Rothwell --Sig_/62QK8zv9iQLslRFcHWl.Fux Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlqnQVYACgkQAVBC80lX 0Gxc6Qf9H3xh6Frqe6kdcZIek9QjZ7wJIlKK42WzXFVR6OVlPZ5OkLZfjmWzt+8n MWNb18KJPW2H0aUYId2nDQ95G8SPizE5x3DtWKLaBOUN5Gqk7skr7t9jEHphHyrV 2MKJYoE42kTzp+srjLDZ1jJ3LjGl1giH2fpcQKx5RE74IbRSsoy5cuGXuiAlIvjq EtTwBTLiu92LXmqmzeyRh/w6dsV2zeaUvy6mdNUfRGfQTZVlTPOzx8Dt4whHaTbX 25fmDfyVOM5z3KGPl9+IQ+yonahVFFdTcj839wDB6/rMzG47Lquj1m1hLPNOiN3N qG9xKYtN4nJm7KjMVKZkVX1/a33zBQ== =7QJ0 -----END PGP SIGNATURE----- --Sig_/62QK8zv9iQLslRFcHWl.Fux--