From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 767F7ECAAD1 for ; Wed, 31 Aug 2022 17:51:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231231AbiHaRv0 (ORCPT ); Wed, 31 Aug 2022 13:51:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230521AbiHaRvM (ORCPT ); Wed, 31 Aug 2022 13:51:12 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9F3D7C326 for ; Wed, 31 Aug 2022 10:51:10 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id q9so14119715pgq.6 for ; Wed, 31 Aug 2022 10:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc; bh=XFXEowDQcVYKezApj/384ov2KBax8K2fIP9yDwQpf9Q=; b=InN4QYFeXhi6K8Y7NaMJWfjcPixUKdsrMbVznMWaVd1BA9zOhRX8Wc45OE8uyf+jqI rL3UOwGqot6QfkagDK2R1YsC4SycKqS2TvLg5W0kieNaLsd1DYbwqpNyNJK/VhMBAv/I QE/seQeOZhDY7uTOjfghA2fjGV97IAFyG0RHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=XFXEowDQcVYKezApj/384ov2KBax8K2fIP9yDwQpf9Q=; b=Sjcna9cLlpY7Y8p9knFwInEJKnr1Xc993EpXFNBsxFoUPDifW+vlPZAmucdYjl26yS xl4z0kQSfW+FQXTVOdW1NlxMfv7fTg5Co3VIcFaS6QCTFhe4rq1RFi+G6sJssf3RNCmz 1x5raUaz+iX/tjyrSgq61qkt+ixW+VzjzC0kS4SBodA5VMAxi40wklMuza7u4U/H4Y5l xY1pnFMDxWsK5qyHt8a3ug0c34EcD5sTcCol356uabrU99VQfhegTNmLPIXOV3tQA636 KcpiDRIIGL9kF6ujyCZ8uQcC7azDUSJifVv+coL3xNeFY0fxJBEQirf+1flMzF/7q/rm +NNw== X-Gm-Message-State: ACgBeo0NJxA8LHFkYOxEzbeAwRQOM7FQjpwfFbB0kIlhQ072ECw5vbrz l83/uhw7sP0ood2D0sP+btoBGQ== X-Google-Smtp-Source: AA6agR5qXFqXkTU2ik3j5m3InZp9lwNmw9IrdpIJekwLeSH8XNA60/frqdTvzd5HJLhsGXxbJoQpIA== X-Received: by 2002:a63:8048:0:b0:42b:73ef:ac8f with SMTP id j69-20020a638048000000b0042b73efac8fmr22058673pgd.446.1661968270381; Wed, 31 Aug 2022 10:51:10 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id r14-20020a17090a4dce00b001fde4a4c28csm1560720pjl.37.2022.08.31.10.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Aug 2022 10:51:09 -0700 (PDT) Date: Wed, 31 Aug 2022 10:51:08 -0700 From: Kees Cook To: Stephen Rothwell Cc: Andrew Morton , Bart Van Assche , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the mm tree with the kspp tree Message-ID: <202208311050.60A8E9C43@keescook> References: <20220830170051.6c190838@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220830170051.6c190838@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Aug 30, 2022 at 05:00:51PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mm tree got a conflict in: > > lib/Makefile > > between commit: > > 5e3ad11bfc5a ("testing/selftests: Add tests for the is_signed_type() macro") > > from the kspp tree and commit: > > 7a2791666971 ("testing/selftests: add tests for the is_signed_type() macro") > > from the mm tree. > > I fixed it up (I dropped the latter commit by using the former version > of this file and deleting lib/is_signed_type_test.c) 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. Thanks! Andrew, can you drop these patches from -mm please? I corrected the filename convention in the above named patch. -- Kees Cook