From patchwork Mon Jul 15 02:32:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13732847 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2BA6D2EE; Mon, 15 Jul 2024 02:32:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721010730; cv=none; b=m6TeRX5iOU5tamE5yP183QelSaGqEyma5iz+rY8AfiZtPtu+KcG2qwT+B/nvr9d8vF5BTOxPfROVkL9O8XeK49bL+LzMpl/WY3TRMELw3VacqciKcwOByf71W36hIW3l0WSjvZaQhOisZaW6fDNs6aWa7h7qSZC6IMgSctG915U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721010730; c=relaxed/simple; bh=fzR/p95q2086VGkqYnPwCfEzaAzY++RI2K823kku07U=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=h9djFgqibZStMy0K/v+7bpOnew2zbjBnaAIjhuPsV6axKuorFM7buDzOpsTfEc2AKjuxS7FeYu7Dr4cg42y413uadqXHEbZL6YI75Yd53R2nYkZGRwzHzdS9GTVNVJO5gkw8xce2CwQR1rN5VnIwwWK8GxmwpqkmFimW7L1d5YY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=PfYmxYM4; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PfYmxYM4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1721010726; bh=KAPolTv3Xg1geLGQx/RurTDhQBE7h29WNswPdwJUBBI=; h=Date:From:To:Cc:Subject:From; b=PfYmxYM4bvVIzILFo0hzTJ3A3dzYFRn4ZfPPuEFtHBXWoYWXEyHL4QfwVr/1QUSxK xGx1nOg7nL/bLZ0AYiXvWuL4iNgGbIg1NLhq3Vg5PcEOStkyUi1NNF8sG6mgsv2Ss5 SrfZd7AyVPLEBZzZlDWcppJtuT5rN2+rwKKPG1dg9DyjQGQ8Yvv0qPKIjHKijXvFI5 SKVIVb334NNaTQJ8tDCQyUaqetwonRrme+sWabQ/SHScEvF3kvt+joTuUddtEcbrTm K6LjvJM4CtSFsAKuVhtmZ4NnvRk5k7gbI+pl/fRX4f6YfhYC/cI7M2Vem46l+2pbKl fB0BwfRBysvNg== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4WMmS53GPYz4w2R; Mon, 15 Jul 2024 12:32:04 +1000 (AEST) Date: Mon, 15 Jul 2024 12:32:04 +1000 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , "Kory Maincent (Dent Project)" , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20240715123204.623520bb@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ethtool/pse-pd.c between commits: 93c3a96c301f ("net: pse-pd: Do not return EOPNOSUPP if config is null") 4cddb0f15ea9 ("net: ethtool: pse-pd: Fix possible null-deref") from the net tree and commit: 30d7b6727724 ("net: ethtool: Add new power limit get and set features") from the net-next tree. I fixed it up (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/ethtool/pse-pd.c index 776ac96cdadc,ba46c9c8b12d..000000000000 --- a/net/ethtool/pse-pd.c