Received: by 10.213.65.68 with SMTP id h4csp1487976imn; Thu, 15 Mar 2018 00:35:52 -0700 (PDT) X-Google-Smtp-Source: AG47ELsmul2uvsFanO2wqoYiHz7eqmseA7yy8r7sPSuTh/aAIuBPyFTsWdoU5ubqshDuMC6vDGSC X-Received: by 2002:a17:902:8f97:: with SMTP id z23-v6mr7026594plo.162.1521099352592; Thu, 15 Mar 2018 00:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521099352; cv=none; d=google.com; s=arc-20160816; b=p+NBTLIfcvEMLL7fGaJS3ZM11NRIXR+q1mBVeYsdlXiYlOxMbSkY40VfbUsKH8HnW+ f24Cbu69ykA+Z/LIL1jqwq0ZtpBbLYF4fRWqgtqg/biJqtuZq63dDnaw6REvCS3yjnGZ AB6JAPcFvWP4D1jvzERt790XjAvU5GgqU1JLLekWBR1Agweyn2DJxk7d+B9s7UUj+OGz lV4TWGUfYHX7DJoy8cGFUJT3bom/lqkuphi+EUUV+kYp1NLSLsx3tx4IoGEEp2Ou1M4Z bQk8QsFe0xgQ02aGfh7Fta597xSn9Z3AjmV/A+wLDo/C6HfsneKfSJKB0ASmt8wzS0T5 ycWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:subject:cc:to :from:date:dkim-signature:arc-authentication-results; bh=BJuxBA3qrYXzFYncQXndqDRzNBlAWvon8bRa6C5mHN8=; b=Y8Lbb8cs2+erTsUuCZw+QP+Mp+67KrOphHpNP8GZtDAVgO68ZKndgT5/9JcLRib8Jo fadrEif/XIJnnLFNKhfjZJeydYY4jah3T1Vk0kU7C38isAAT0RrZmOJwDaThv/uas2dP aamRwIl4R1TnOen3INXQSMoWUtPrqTlSlQVyWK/wV1/J35aYNxjZ7QB1lQSiClzdGTr+ iyE21TAT/9hyywt5nVWFBF1t8G2W48PJbpOXBaJroZOEc9OW4tKSy0GKe3z+uBU2CER3 7FJK8cYQ0mfSrAd+Caqe47lRO/T2Si9P5ZP1rUXmLifB35dPZSJ/4uRE6X6XpRsdWx12 uUcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=mzIoH+Fa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t8si3088217pgc.273.2018.03.15.00.35.38; Thu, 15 Mar 2018 00:35:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=mzIoH+Fa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751805AbeCOHeo (ORCPT + 99 others); Thu, 15 Mar 2018 03:34:44 -0400 Received: from ozlabs.org ([103.22.144.67]:47555 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751653AbeCOHem (ORCPT ); Thu, 15 Mar 2018 03:34:42 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 4020jD2LxWz9sVW; Thu, 15 Mar 2018 18:34:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1521099280; bh=p2pQt6DEtRBiunIbbQsL/Uh9GsPEQPiLLk4+rdic0ug=; h=Date:From:To:Cc:Subject:From; b=mzIoH+Fa3r1renUOd7qxS7klJqC+h9TQFYIjQtNx0ivEPeuCqXqF0NkNUECSh5rQN jNx2PZR8uP9MHW8H8wQOEMQk3f9oBk2zasE2kp5qkEeyEGp23YDeNjpcGAXG4CyQx+ YgtPFnjo/id10A9S56+TJhbWq5dTWvvGUHCfU/mWmdUjJysLE+KREYS8TvyMJOvvbr vW1LbnLD0/Cb5ESsy9zqB2TuzDTknj8xiyhyyp1EJLh0hWNiFvAtkGNIXD/R3jPR5O 0ryx7fge9XSWPgGSHMaBMee7L7HxfcddeUzobEBHZA8AB5doYvQVe98JdrFUIW5Bno Wz24CuzycHEAQ== Date: Thu, 15 Mar 2018 18:34:12 +1100 From: Stephen Rothwell To: "Martin K. Petersen" , David Howells Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree Message-ID: <20180315183412.01412755@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/nX3i2UYX.tvbaVBnXGnMu4I"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/nX3i2UYX.tvbaVBnXGnMu4I Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/eata.c between commit: 5b76b160badb ("scsi: Lock down the eata driver") from the efi-lock-down tree and commit: 6b1745caa14a ("scsi: eata: eata-pio: Deprecate legacy EATA drivers") from the scsi-mkp tree. I fixed it up (I just removed the file) 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 --Sig_/nX3i2UYX.tvbaVBnXGnMu4I Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlqqIfQACgkQAVBC80lX 0GxG4Qf/exik1BbI+H5UsC6pUY+XAUhZoipRtgOvgvt8Xv/TnZPIXgVvbk03AnnA 9SKucaC29+2OSVbt5cP92VYkNipjni+madhSPT80M94bQk9p/ZPOUfyfvxQg64P5 cI8PufREK7h3yKBP8x7+90tXPwtKOIjtpzwy56WYznBTBMYvHVaKzJ/w0XXvps+n n+U55S3N4CNjHqUG0xLutxPOfTGRxZnnhRguvo34Y/cnoXL138j8T6L/7II2T1mF jzheHxNl6fufa40DR9ulovMbZE8CHkQEk1fV6NRXrB5SvMqDGnocHlPwtfRWU7JB 1H+lQMoAT94gsH8X+5L9+ojHjWI/Mw== =8UoR -----END PGP SIGNATURE----- --Sig_/nX3i2UYX.tvbaVBnXGnMu4I--