Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp633839rdb; Thu, 19 Oct 2023 14:41:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVDXuN24gYScn0yge6Xce9TzFeDkSYBXtpVYrx6bY1Wg5gl7tUztUjNcV2D12vI4antsuc X-Received: by 2002:a05:6a00:174c:b0:6b4:c21c:8b56 with SMTP id j12-20020a056a00174c00b006b4c21c8b56mr3724441pfc.23.1697751716326; Thu, 19 Oct 2023 14:41:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697751716; cv=none; d=google.com; s=arc-20160816; b=pnGu/ZrSsmfUdO/Bx+FjNyLMQp3nJBhgrzOP5r+vXOWGpAyW2jvwANX1ZF8PxDKEG9 0loopggQlHhtC5au02kGoNfq1Mq2rA2zH5/zJhGZesLMtp6adWhwRFkVW3J4sPqPr9jI sfSvGAymbeeFvRaz5guRVGcUrgjLWZJz38U9mPZzJPjrphgc1fD5EjaMqQDhvZDI3Q4c 1SoZ2giGtTVKu3KDJEEaFUfYZaT/vXY8hnaH3VpZ6BMnaShSrGuKbWHgaQ/jxJ8+9HZV X48ka66X73wchoAjGqu5RwkK4g5+0wbZLA8mgyCF1U5Grzfbq8VC8xFYTHZU5qLKh78A 6EJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=NKNXcGuoZ2KSznIhZDc2nzoc1RQVtm8GNRgytXvNrrQ=; fh=YJZ6GYJ7B0JARp4kJQ0X4ntuVrIvey+g+C1zW+A2vKA=; b=zone+bFJU/lpX8NUpM8GnWFfSXcwdIT9ZQbmHsY7DjnfPT6tWmyUWQ14Xr7B+kK+a7 0gnvGaJintoIVumXSooHP185hAXcnkOxrLDeE4qJhASMm4CRFyD1BnOHh9/5/JhT1oIV uGf+m+zdSJT7+J4iddtjctDW1Rgs2tQO6QqFUIwY+td5L7/mYe14st1BcGTHXGt+LpOg O1R+IrLdqaT7jvco1gyqeWTjfKOfoyvGK7WSx82nZEOdvYBxDWB3ATdPsgKYPSXAoGFW YUYTlao62jQ7jLlJZ8ufriyJWWAtQJxKU4TwLuCQ3TH4fVJ5MiFmjSlzBq4jfaRSpNxj P9Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=to2UauIl; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id bx31-20020a056a02051f00b00578b6e2f462si556309pgb.351.2023.10.19.14.41.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 14:41:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=to2UauIl; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 209A080E4B10; Thu, 19 Oct 2023 14:41:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346597AbjJSVkI (ORCPT + 52 others); Thu, 19 Oct 2023 17:40:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232759AbjJSVkH (ORCPT ); Thu, 19 Oct 2023 17:40:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0291116; Thu, 19 Oct 2023 14:40:05 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F187CC433C7; Thu, 19 Oct 2023 21:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697751605; bh=x8GN6NCbu6Jk2mBeilh7gQpV1V166ITF8wV8WZ8Ek0k=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=to2UauIl3D3hwG5RmRnkrOS1DYL9XFSGhy7AnbJaHCXWB1KffB7tMJGcltBXZrPX/ SHMTWHuFFaofvz6bf3vJdB4IeeiQxmo6X8zAS23BT8h6gUAVWiNKvR33JNhlLkwYM+ ggxco2EUInTehFsFfMqBACGYg25QC1ZCogOlH+ia56BF4SMuN9OwCq9Ibkec22r68g CsA43XYVJiaJb3RJnH2PR3mqScVUDo6B3NPaSk39dEMnQ2ertwr1BKYuy2/Vl9YHtp GabfRHHgXvBtGKTkWBPyxaz4KiuMID8YUgSztQAuFkdHSFymoCP4enVoq3aGk9fPt/ +DfOeIAXj8LJg== Date: Thu, 19 Oct 2023 14:40:04 -0700 From: Jakub Kicinski To: Johannes Berg Cc: Stephen Rothwell , David Miller , Paolo Abeni , Kalle Valo , Networking , Wireless , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree Message-ID: <20231019144004.0f5b2533@kernel.org> In-Reply-To: <987ecad0840a9d15bd844184ea595aff1f3b9c0c.camel@sipsolutions.net> References: <20231012113648.46eea5ec@canb.auug.org.au> <987ecad0840a9d15bd844184ea595aff1f3b9c0c.camel@sipsolutions.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 19 Oct 2023 14:41:37 -0700 (PDT) On Thu, 12 Oct 2023 10:10:10 +0200 Johannes Berg wrote: > > I fixed it up (I just used the latter, there may be more needed) > > Just using net-next/wireless-next is fine, I actually noticed the issue > while I was merging the trees to fix the previous conflicts here. Resolved the conflict in 041c3466f39d, could you double check? Also, there's another direct return without freeing the key in ieee80211_key_link(), is that one okay ?