From patchwork Tue Sep 26 02:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 727080 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 41066E8180C for ; Tue, 26 Sep 2023 02:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233284AbjIZCUY (ORCPT ); Mon, 25 Sep 2023 22:20:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbjIZCUY (ORCPT ); Mon, 25 Sep 2023 22:20:24 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B577BF; Mon, 25 Sep 2023 19:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695694811; bh=TcPGSxwt9MInQj/celUnubsm5b1vkF3Gs12n9nTNg+c=; h=Date:From:To:Cc:Subject:From; b=e9xdnIuv+S5IexeCO7HdwPtekTa9fEYqE+2bQnMadh1ivXxvgDwpv6gXZ6ENQg+OG ncOiQyjwezbh3KJUO1sY8CrLaQsprvYpudhZHQ/lvinoN/ywcvay6Xn9Ex+0ikrJ7U WFOYqcuy2RAHeVb6wHa5ybX5ti0YZSqOPrCqG46d3C+aMVyDqOMgHNrjl8ETiz2Dc6 BBJ0s/NCk5Q/H8OOPfGo3KYn0syGAWzIDz1f8EVAZhHu3UDXiEmpr0jQfhrSTBPn9h C0rkYSY4uNqoZBHsY7ZaMciVQeYGJy75hsGzlxp9NKRq4gwChcmIsg/Fvd4mAg0mZg ZY/2fIn8NMVWw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rvk3b0wJwz4xPR; Tue, 26 Sep 2023 12:20:11 +1000 (AEST) Date: Tue, 26 Sep 2023 12:20:09 +1000 From: Stephen Rothwell To: Kalle Valo , Johannes Berg , Wireless Cc: Johannes Berg , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the wireless-next tree with the wireless tree Message-ID: <20230926122009.67735060@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: net/mac80211/key.c between commits: 31db78a4923e ("wifi: mac80211: fix potential key use-after-free") d097ae01ebd4 ("wifi: mac80211: fix potential key leak") from the wireless tree and commit: 2a8b665e6bcc ("wifi: mac80211: remove key_mtx") from the wireless-next tree. I fixed it up (I think - see below) 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. diff --cc net/mac80211/key.c index 0665ff5e456e,ac410f6632b5..000000000000 --- a/net/mac80211/key.c