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 X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57343C76186 for ; Thu, 25 Jul 2019 00:54:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CD5121871 for ; Thu, 25 Jul 2019 00:54:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="VBIC7Xlq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387706AbfGYAyS (ORCPT ); Wed, 24 Jul 2019 20:54:18 -0400 Received: from ozlabs.org ([203.11.71.1]:60979 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728030AbfGYAyR (ORCPT ); Wed, 24 Jul 2019 20:54:17 -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 45vDHp4W94z9s4Y; Thu, 25 Jul 2019 10:54:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1564016055; bh=CtDpK/eCs/XjTXFGpNFgiwbr9oNlBKo8wVNVvbRB6RI=; h=Date:From:To:Cc:Subject:From; b=VBIC7XlqnSHdMyIIuGNivnGuXnfJWFajwdHlgO//aGD1xLRONkRV/spARLsVyIovs +y2dds7JTAPFgiQMCrPiOSpwcULCglo+iAK/paQGB8GonywJEfM2wb31nOupJBc1yf fcHvUxhzlWlrkbSPFFo/04ivlvj/XWfJw9Bpi5cyS1tJL7QPTpgdDkntbUa6uVp5vY HTmzQFuOi0rok8UR57LVwFHR1sW2UnVQCoLDbVesZMEmJpkguNsOOrAg3EfIfnvK0b IRbGn+uM/S+zDb48Jm+OoGlRcN2MsqPEfABfsUksrvX7KNL50IN/Ub6hNKhU70oOOj cxRWgcMqnd6og== Date: Thu, 25 Jul 2019 10:54:13 +1000 From: Stephen Rothwell To: David Miller , Networking , Jonathan Corbet Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mauro Carvalho Chehab , Benjamin Poirier Subject: linux-next: manual merge of the net-next tree with the jc_docs tree Message-ID: <20190725105413.2e79aedb@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/l=4b07mKDfUHi57GHTS8hni"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org --Sig_/l=4b07mKDfUHi57GHTS8hni Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in: Documentation/PCI/pci-error-recovery.rst between commit: 4d2e26a38fbc ("docs: powerpc: convert docs to ReST and rename to *.rst") from the jc_docs tree and commit: 955315b0dc8c ("qlge: Move drivers/net/ethernet/qlogic/qlge/ to drivers/st= aging/qlge/") 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. --=20 Cheers, Stephen Rothwell diff --cc Documentation/PCI/pci-error-recovery.rst index e5d450df06b4,7e30f43a9659..000000000000 --- a/Documentation/PCI/pci-error-recovery.rst +++ b/Documentation/PCI/pci-error-recovery.rst @@@ -421,7 -421,3 +421,6 @@@ That is, the recovery API only require - drivers/net/ixgbe - drivers/net/cxgb3 - drivers/net/s2io.c - - drivers/net/qlge + +The End +------- --Sig_/l=4b07mKDfUHi57GHTS8hni Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl04/bUACgkQAVBC80lX 0GxFGQf/bZ+grLWvDeYd53dLGX5+i4C25MERID0fBWLYuktsEwnK2HLIFL7aQZnw j/aid9hWbdLpdvTNystisGwCT6FUd0yBbHoJKQvGnBSiUhDhnhluinfKA29vVvEp vIbW5wgieJNDmTKfJdM+NVBnz/rw1KTDNrS6HjztdGdNiExKeDLAhFhd+1ErDu+7 8IjD7mSyL/PPv1iKi6fbwxe5f/D20s7czrv8iJ/Po6QmMWlPVUBQiOo+29b5EPHh e0zXiTwHHBy1aujh4mvWxWwvE+XVFFonUCSmDF/bKxPbFkLyYNbZIfNqPTz2HxtQ id0l82+ffhR2imnGGBABWyN8Bbs2KA== =lkdQ -----END PGP SIGNATURE----- --Sig_/l=4b07mKDfUHi57GHTS8hni--