From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80048.outbound.protection.outlook.com [40.107.8.48]) by sourceware.org (Postfix) with ESMTPS id A44D53858C50 for ; Tue, 18 Oct 2022 13:35:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A44D53858C50 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=kmMbOzbcOh90smvkyKMJPU0KT+99arU/TDtxf3OfDu3RGsVmzu3Es8iQ28CkFE9+rKylIXw3/+0AMHcK3rMhD1sQjzRVYeFMNwsyzVHLuIVC0TMuD6qb/mM3X2yRiZwGR/KDQ9EQjgmZcQwFJwd4oEmTr+Cx/fM4XobGHiftKxE0CQfEK+NL693yAdmN7Glbqh0Hx4zIwtoWQh3spZD1di209OuVRFAFQ2IpXY2QR/aNc7+3x475n7q4LWBM92ni5oBAMAJVtCdDmPi5OIsCGCYnav2OP+SaNVuoGQry2PK6nlBGfknvyMkmSGj0VZO0H7fLLTAW84YJoUpEIEYmhg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tCzo7Sz70jflpNuUIL4RQWDhB7A6qzOfsoe90B7UqnU=; b=WzCsZ5NHIZ+KN7GWrcX9PQMk8tr2IEeQGLJV5hCFRxonJpl0ZZssV8toSf1nPj2T0mz2/tQaePudy2MoRElydJxyBM9XPM6NYgSK/W981qZH3JqEImIoVNVafivqi2KO8uhtdW9hAZb8JxQXTYRr00vpyVcUyzjsbtSwo9xUShJae+Jj35o8e98XFQwE0+0w/Yao3dOqOl3FE4Ik9iialsvNGmtFO1EPg9ebrmRqII6WD6PGTqiIp+O6Q5kyrQiJJQr76/qpQr7hJQUK2MqMqGpMJxjZJ+FugPjxM0ZdS242bvlOGI9+er9VP4zPNGaLVK17zgNsXZhM+HEX4oyBBQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tCzo7Sz70jflpNuUIL4RQWDhB7A6qzOfsoe90B7UqnU=; b=eufRp302LKdRkQNT7ILH+/+vY0b+pXhwWAVF14mRY8gXMP2zlklzYgTLQx8hO9fgtk18rSbIImUEtFJmxpQEX/9GUK8+m2BLld1Z3QYbF7qimbBZbGxJTSyo/Il7uP0m5uw/1jPnQnSyaYdm1OM0rxW6FJNFIuXKXtYtuotVFv0= Received: from DU2PR04CA0250.eurprd04.prod.outlook.com (2603:10a6:10:28e::15) by AS8PR08MB9196.eurprd08.prod.outlook.com (2603:10a6:20b:5a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.33; Tue, 18 Oct 2022 13:35:28 +0000 Received: from DBAEUR03FT010.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:28e:cafe::64) by DU2PR04CA0250.outlook.office365.com (2603:10a6:10:28e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.25 via Frontend Transport; Tue, 18 Oct 2022 13:35:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT010.mail.protection.outlook.com (100.127.142.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10 via Frontend Transport; Tue, 18 Oct 2022 13:35:28 +0000 Received: ("Tessian outbound 73ab5f36653e:v130"); Tue, 18 Oct 2022 13:35:28 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 19e27c5201480d75 X-CR-MTA-TID: 64aa7808 Received: from 5e7cbf12e7e5.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 05325B59-854F-4950-B3FB-52819D0972CC.1; Tue, 18 Oct 2022 13:35:21 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 5e7cbf12e7e5.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 18 Oct 2022 13:35:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PfTfORFCMM33+6DWTaLUa69eYRrdiO7S/soZlZ4dMPrSF5y8yoALfGsCX+1G29c0sq8oCcnWqM9SW1WU8iVmbKWRxGq4chQFViSslygVn8ISfWLfeGHDq96fQkoRV4Nqb73FIVtThXcoE6bpT89UZT3NrksQAThSfQq+Gyu9ChKUSqHe6D0AkLuseIPThdgnVgIb3NYFBw12bwiJWaphIJ/yDvt8p2OBPqTvZ1RFH1kXkRWC3CjEnLbXBknceE78EN9EaBHfBCRvPGdvmoycIUnEeHxjPoGpDHzV23kH+V3n6Wr8t40S1aXC3QWY+DngEimwxZ4rndT2O8xSOw3wHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tCzo7Sz70jflpNuUIL4RQWDhB7A6qzOfsoe90B7UqnU=; b=EbL45zoC5p3MaTWiYjPwIafFqKqKzbeGqU9BQu0T7sA8r4niWq8Zk58Bggta4XbXD+IxRsOftoN3D4R7DRmZa9x5MkMJm8kiDRtVDbtd5YUINgKKQG2fr6ufAXA1tLeg837UE6+lddqJMQAxVuXOnH3MDaLUubtWTHMnlV3cW/zyJHGUZfrgvpLZapX4ckws/hjYVTakTgzNqWMDsnaPeoTLqXTXZg4ft8RX4L9QEnTjB9IlV97qoWKddUPmAWgoofhEpaS5jCPKRK+9LG+i2WzDr+Qx7rE98lP/BbnLyeSPswcaOph+4rAl24cPoqN9nY6ooIfR+kpczIjf/Q07Ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tCzo7Sz70jflpNuUIL4RQWDhB7A6qzOfsoe90B7UqnU=; b=eufRp302LKdRkQNT7ILH+/+vY0b+pXhwWAVF14mRY8gXMP2zlklzYgTLQx8hO9fgtk18rSbIImUEtFJmxpQEX/9GUK8+m2BLld1Z3QYbF7qimbBZbGxJTSyo/Il7uP0m5uw/1jPnQnSyaYdm1OM0rxW6FJNFIuXKXtYtuotVFv0= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from DB9PR08MB7179.eurprd08.prod.outlook.com (2603:10a6:10:2cc::19) by DB5PR08MB10114.eurprd08.prod.outlook.com (2603:10a6:10:4a3::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.30; Tue, 18 Oct 2022 13:35:13 +0000 Received: from DB9PR08MB7179.eurprd08.prod.outlook.com ([fe80::8999:7c8d:d088:d198]) by DB9PR08MB7179.eurprd08.prod.outlook.com ([fe80::8999:7c8d:d088:d198%5]) with mapi id 15.20.5723.029; Tue, 18 Oct 2022 13:35:13 +0000 Date: Tue, 18 Oct 2022 14:34:59 +0100 From: Szabolcs Nagy To: Wilco Dijkstra Cc: Carlos O'Donell , 'GNU C Library' , DJ Delorie Subject: Re: [PATCH v4] Remove catomics Message-ID: References: <0714edcb-c70c-49d1-d4f5-9bc899148af7@redhat.com> <2b91ee78-9c46-edbd-96ee-cc078475b331@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: LO4P123CA0258.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:194::11) To DB9PR08MB7179.eurprd08.prod.outlook.com (2603:10a6:10:2cc::19) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR08MB7179:EE_|DB5PR08MB10114:EE_|DBAEUR03FT010:EE_|AS8PR08MB9196:EE_ X-MS-Office365-Filtering-Correlation-Id: b181aeba-504c-4190-d4e8-08dab10d9ebc x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Fp2CMchvADThvI2vitvqBUiKq93Qoz/ow47EoR5Q+te/ppmzSva3Q7LmX0l7LjqpPBxp/S1YsBD4Nc4eBFk6KnVjA/0UaGjzGhtuXXwqbq6ebNIaZxPXNqeOrB3UIZumIuZ/+WoOrWQtoNqh7uMZhjlGtKvJca3rDZZb+h8YXrtDQH4+RwGvJcDIBRzrt4qkM7RFgzR9YyarQnEJxu10DGnGIO0jWfKzuCSAaZ6j51ngw/aidPuaWNFBWVuBjHVSyH5WzwROBi9tERXyQm6xUTSU+OHBd0Zy0ke/ugUcqnQXRkv6+eb19wMT5b85Hxk5Gg4Z6TURGur6AXe/ctJqUQetaidMgPggyqTzbkVOusBfehm49BY8z/YefzpDXiwc1Qf6e+DIx7wvdiUmF0ZruWxe2VOmSd1ffpYroXVDXY9jfYpo/3ip9mNJiOWtxJuyYoE8jy1iwXTHfFgRjANgkvrC7P5025NFigdPv3Evr/DWOSLmwL06IYfntxaoqPZFpQbrJzQkdJ3MjgZ2e1+CrBuFd9gprL0KQYiQXlMWibCL3zbUH/EdC/yOVG/32qKpXTSbygbD/5FyjBs/TxQ6Z+aXoEXwTY9tt9vtfX8JzZzYQY0erW9rG93gp2N5I6kLAUNzJpZbXXN25XhO2mPjn0ahptr9jR+GINdwqn1tkrtmJgsAlEQgXM4pBu5Yq1PlZutACaLqKfx0EMN//LTltJ4HvWTkNfXFdowY4ELxxAk= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR08MB7179.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(39860400002)(346002)(376002)(366004)(136003)(451199015)(36756003)(38100700002)(8936002)(6862004)(44832011)(5660300002)(4744005)(6512007)(966005)(86362001)(26005)(4326008)(6636002)(37006003)(6486002)(54906003)(478600001)(2616005)(6666004)(186003)(316002)(66556008)(66476007)(41300700001)(8676002)(66946007)(2906002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR08MB10114 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: f3d48e6d-8130-40da-ffc2-08dab10d958a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z8W3otAoW1n0gIk15gEPJG7MgDLjkOU7AY6NJSknGMzUIB7u+5lxqfEcN898GY5ZdskBcacddBz9fuY+AsQvjn5GbG4vfj6AnzSnQpoLkHlo87y93VdlwFEfCtaC/5THYxs2wcbdfCgFmbt56H5FK0tUOiQHgNrB18AVjJ1KVWXWQJZUFtBc4WaTh2hnfZerrVv6SUn8Ab7OOB8goweElvCQ0JuLHFL8s6/hOA8BAAk+x73vMXAhd2yru+eFVX4698559zYkQaL72PqkdARgtBQWoozNHZUUZlilUOfFJ2JMTs1CRzjmqZiqWvhb8B7bizcGt2YVMMvzytxByyyhGqDZrM285YcaWErWZd7OlMDKJ3ENwIb6X933QKSpE3fBOg1l+VdW/ecnLiNv+wXaPCs0DzQtqVTPL+DYGe4O7HjIB+egHjysZhoj4LruJlW1PXNceQhHgssKgKopc+hhrNTrRxkEX5GtlKEzGEx7jKbSQoObCfIlpi/+Ee/a9aKQWdmn/pgF/P64Lc09fq8bxINTy2UAlaC/aps2qxPMfhel0ThrD+TdH/hPTdPLWo2tWQNJy2PLRG9T8akHsnmrpYcUr67EivAiJAX7cNtShQ8/XgIQQx/g1Njv795aBNrO6CqAGos2ykYQa95dTGXxEN1JWn8ctPngx+F2ntx1VQLGIWVcakWIxH5EyTcesUQ4iQDNXT2mLWDLFmJxz/SyKgrt8CLVbEprUQFii0FwZCK/TRSUdygw5Qz3KptdFV5eqIdOtqr0TDwh9fyzAQO5aJMuWaUfCSipqVRD4FR9EQk= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230022)(4636009)(136003)(376002)(346002)(396003)(39860400002)(451199015)(46966006)(40470700004)(36840700001)(36756003)(86362001)(356005)(81166007)(82740400003)(2906002)(336012)(4744005)(40460700003)(40480700001)(6862004)(5660300002)(44832011)(6506007)(6512007)(6666004)(2616005)(186003)(47076005)(107886003)(26005)(36860700001)(6636002)(6486002)(966005)(8936002)(82310400005)(316002)(37006003)(54906003)(478600001)(70206006)(8676002)(4326008)(70586007)(41300700001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:35:28.2213 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b181aeba-504c-4190-d4e8-08dab10d9ebc X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9196 X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,KAM_DMARC_NONE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The 10/18/2022 13:01, Wilco Dijkstra via Libc-alpha wrote: > Hi Carlos, > > >> It works fine for me - the patch merges using patch -p 1 -i . > >> What settings do you use in the CI? > > > > git apply -p1 > > > > https://gitlab.com/djdelorie/glibc-cicd/-/blob/main/trybot-apply_patch.py#L65 > > Right, it seems that is not compatible with the default settings of 'patch'. In general > for CI you want to try to match automatically whenever feasible rather than only > accept perfect matching patches. This is even true for auto-commit CI since you'd > only commit after build&test passes. > > How about adding '-C1' which allows for a reduced context? i think it is expected that there is no conflict with whatever is in current master, which works if you rebase your patch before posting.