From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Authentication-Results: smtp.codeaurora.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="bc6eLp7n" DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8466F60263 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751743AbeFFEhp (ORCPT + 25 others); Wed, 6 Jun 2018 00:37:45 -0400 Received: from ozlabs.org ([203.11.71.1]:55193 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750785AbeFFEho (ORCPT ); Wed, 6 Jun 2018 00:37:44 -0400 Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Date: Wed, 6 Jun 2018 14:37:41 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Josh Poimboeuf , Sridhar Samudrala Subject: linux-next: manual merge of the net-next tree with Linus' tree Message-ID: <20180606143741.194a5a06@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/NP9I/APRKw/L5VIzJ6ESjQG"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/NP9I/APRKw/L5VIzJ6ESjQG 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: MAINTAINERS between commit: 2562c011f897 ("MAINTAINERS: add Josh Poimboeuf as faddr2line maintainer") from Linus' tree and commit: 30c8bd5aa8b2 ("net: Introduce generic failover module") 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 MAINTAINERS index 8ac49add2df7,884657f0be11..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -5430,11 -5413,14 +5430,19 @@@ S: Maintaine F: Documentation/hwmon/f71805f F: drivers/hwmon/f71805f.c =20 +FADDR2LINE +M: Josh Poimboeuf +S: Maintained +F: scripts/faddr2line + + FAILOVER MODULE + M: Sridhar Samudrala + L: netdev@vger.kernel.org + S: Supported + F: net/core/failover.c + F: include/net/failover.h + F: Documentation/networking/failover.rst +=20 FANOTIFY M: Jan Kara R: Amir Goldstein --Sig_/NP9I/APRKw/L5VIzJ6ESjQG Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlsXZRUACgkQAVBC80lX 0GxYEQgAgT50zctDkkCESwKSac3xKzMrnX/b/t2X5nwGGEtCi6x7LAWG9gwUkr/A cHjYVVf+BBYOX/1QGJyH5gbmfheu1lhkApQAF6pO9By4C9/d72sktLGWyhmFxo8m h72hoUNCrmcSdD8yKI+NudgXLM31r0Cdzzc/DiB+FtH6tZDkgAYcCTf1qSwFPkbS K7woJgtlNMGzGvXqePUOJ50tNul07DIeuSEYIGpYyaT4n7wRNxDuiZwlygpvCIk3 CaxjllofLlecWe/+24g3y1Mh2O9jAr4VCEPaFmUeMcx3yW5a+zc82kV+TDD1eJEj svZdT881xU/DwrhFrwnEhTqYxYcRVg== =24o2 -----END PGP SIGNATURE----- --Sig_/NP9I/APRKw/L5VIzJ6ESjQG--