From patchwork Thu Sep 12 16:25:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1161673 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PbGH0BY0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46Tkf01665z9sNT for ; Fri, 13 Sep 2019 02:25:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730279AbfILQZl (ORCPT ); Thu, 12 Sep 2019 12:25:41 -0400 Received: from ozlabs.org ([203.11.71.1]:40705 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728558AbfILQZk (ORCPT ); Thu, 12 Sep 2019 12:25:40 -0400 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 46Tkdp19g3z9s4Y; Fri, 13 Sep 2019 02:25:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1568305537; bh=x7EVpTBrd+PPAAF9JFRVmnGBnTTrRhrlDywgHHXaI34=; h=Date:From:To:Cc:Subject:From; b=PbGH0BY0NAMFxGPupNcDEm5tbm3pMVYFzYC1/hEP5mBqkaN0qt6v/P1hR5g4w1ZpO BN/xP5R8h9YpnoGNwumuMSwE9EUS2FzQfJCS+CDefvcUnIZDsoC6pAHOHgfpOJb6gP QKwmXuS5BDs4MksGudG8ns/z3/z45KlkI/m5fStSUjLrjOEM7SIkoeE08EWYnVt3HM 9GWL1A0fiwhwNLVCIiUaStzBx238jNinmmNwZEa4ZcMqkUwk0dipP9RdiZuatY3AtT Mr9LqZLFmsD2dZwW/x+LPP/Pm68yyzDtObIeY13HnqqLAtRDY+P09uLQXGYax24+Gc ycDPgM7UgVQqg== Date: Fri, 13 Sep 2019 02:25:35 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Ilya Maximets , Jeff Kirsher Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20190913022535.65ac3420@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c between commit: 5c129241e2de ("ixgbe: add support for AF_XDP need_wakeup feature") from the net tree and commit: bf280c0387eb ("ixgbe: fix double clean of Tx descriptors with xdp") 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. Acked-by: Jeff Kirsher diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c index a3b6d8c89127,ad802a8909e0..000000000000 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c