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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham 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 1B4D0C10F0E for ; Mon, 15 Apr 2019 13:48:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3AFE2073F for ; Mon, 15 Apr 2019 13:48:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727276AbfDONsZ (ORCPT ); Mon, 15 Apr 2019 09:48:25 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:33753 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725789AbfDONsY (ORCPT ); Mon, 15 Apr 2019 09:48:24 -0400 Received: by mail-pl1-f193.google.com with SMTP id t16so8611771plo.0; Mon, 15 Apr 2019 06:48:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=xh9GwCIdz7qJLoQVUds1a6AaDGgXNZOM6ZxQi1UTg2A=; b=S5d4nufo1A24wLtd8kF6J+UF1nWqRzXUBbFA4YaT2ICL/BvVGO1SIkL1cjP3FYf02z 4cNq99zlChL8oK6De3LnwFWfnu26ga95rLMZQ6V394qfwq8oGCQy6LPAlCSeSvX4w+j7 vqn33nRXF6u7DEL1nTX0rE2DgAwW4X7pnokBeQBkzxmDCd9Ft9DEv9EiJTofgFIy+lgH XXfChOSR60Dzd9BAI0Htd5mrsIDRp/YULYb6hCr7LVUiz3UuMPttgskhoj2rbuvZ06DL eBTrZt+G83W+puB0j28p/YMiXaFdlapb2EZG7VQhm/oVj8sSziuVJ9QaksowEwXsbhS3 VtBQ== X-Gm-Message-State: APjAAAXnvgp+YXl99KutQaQezIkYl/NIlmHw3qR6HnHCoh/81lhJTJYe +5ObMNlZ0MCkvnIbdPukTVo= X-Google-Smtp-Source: APXvYqwXNoUTlkl7l+1/12RZToCXAFo+6gthBfkg4gsWFZ+hkPn80Lb6s4l1FFaN20t99p3TXDG2YQ== X-Received: by 2002:a17:902:54c:: with SMTP id 70mr43762222plf.210.1555336103825; Mon, 15 Apr 2019 06:48:23 -0700 (PDT) Received: from asus.site ([2601:647:4000:5dd1:a41e:80b4:deb3:fb66]) by smtp.gmail.com with ESMTPSA id b13sm47326454pfd.12.2019.04.15.06.48.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 06:48:23 -0700 (PDT) Subject: Re: linux-next: manual merge of the scsi tree with the block tree To: Stephen Rothwell , James Bottomley , Jens Axboe Cc: Linux Next Mailing List , Linux Kernel Mailing List , "Martin K. Petersen" , Martin Wilck , Christoph Hellwig References: <20190415155939.35325ef1@canb.auug.org.au> From: Bart Van Assche Openpgp: preference=signencrypt Autocrypt: addr=bvanassche@acm.org; prefer-encrypt=mutual; keydata= mQENBFSOu4oBCADcRWxVUvkkvRmmwTwIjIJvZOu6wNm+dz5AF4z0FHW2KNZL3oheO3P8UZWr LQOrCfRcK8e/sIs2Y2D3Lg/SL7qqbMehGEYcJptu6mKkywBfoYbtBkVoJ/jQsi2H0vBiiCOy fmxMHIPcYxaJdXxrOG2UO4B60Y/BzE6OrPDT44w4cZA9DH5xialliWU447Bts8TJNa3lZKS1 AvW1ZklbvJfAJJAwzDih35LxU2fcWbmhPa7EO2DCv/LM1B10GBB/oQB5kvlq4aA2PSIWkqz4 3SI5kCPSsygD6wKnbRsvNn2mIACva6VHdm62A7xel5dJRfpQjXj2snd1F/YNoNc66UUTABEB AAG0JEJhcnQgVmFuIEFzc2NoZSA8YnZhbmFzc2NoZUBhY20ub3JnPokBOQQTAQIAIwUCVI67 igIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEHFcPTXFzhAJ8QkH/1AdXblKL65M Y1Zk1bYKnkAb4a98LxCPm/pJBilvci6boefwlBDZ2NZuuYWYgyrehMB5H+q+Kq4P0IBbTqTa jTPAANn62A6jwJ0FnCn6YaM9TZQjM1F7LoDX3v+oAkaoXuq0dQ4hnxQNu792bi6QyVdZUvKc macVFVgfK9n04mL7RzjO3f+X4midKt/s+G+IPr4DGlrq+WH27eDbpUR3aYRk8EgbgGKvQFdD CEBFJi+5ZKOArmJVBSk21RHDpqyz6Vit3rjep7c1SN8s7NhVi9cjkKmMDM7KYhXkWc10lKx2 RTkFI30rkDm4U+JpdAd2+tP3tjGf9AyGGinpzE2XY1K5AQ0EVI67igEIAKiSyd0nECrgz+H5 PcFDGYQpGDMTl8MOPCKw/F3diXPuj2eql4xSbAdbUCJzk2ETif5s3twT2ER8cUTEVOaCEUY3 eOiaFgQ+nGLx4BXqqGewikPJCe+UBjFnH1m2/IFn4T9jPZkV8xlkKmDUqMK5EV9n3eQLkn5g lco+FepTtmbkSCCjd91EfThVbNYpVQ5ZjdBCXN66CKyJDMJ85HVr5rmXG/nqriTh6cv1l1Js T7AFvvPjUPknS6d+BETMhTkbGzoyS+sywEsQAgA+BMCxBH4LvUmHYhpS+W6CiZ3ZMxjO8Hgc ++w1mLeRUvda3i4/U8wDT3SWuHcB3DWlcppECLkAEQEAAYkBHwQYAQIACQUCVI67igIbDAAK CRBxXD01xc4QCZ4dB/0QrnEasxjM0PGeXK5hcZMT9Eo998alUfn5XU0RQDYdwp6/kMEXMdmT oH0F0xB3SQ8WVSXA9rrc4EBvZruWQ+5/zjVrhhfUAx12CzL4oQ9Ro2k45daYaonKTANYG22y //x8dLe2Fv1By4SKGhmzwH87uXxbTJAUxiWIi1np0z3/RDnoVyfmfbbL1DY7zf2hYXLLzsJR mSsED/1nlJ9Oq5fALdNEPgDyPUerqHxcmIub+pF0AzJoYHK5punqpqfGmqPbjxrJLPJfHVKy goMj5DlBMoYqEgpbwdUYkH6QdizJJCur4icy8GUNbisFYABeoJ91pnD4IGei3MTdvINSZI5e Message-ID: <84c02649-1eeb-3d28-6cc2-0a5d0f5f6b7d@acm.org> Date: Mon, 15 Apr 2019 06:48:21 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190415155939.35325ef1@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/14/19 10:59 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the scsi tree got a conflict in: > > drivers/scsi/sd.c > > between commit: > > c92e2f04b359 ("block: disk_events: introduce event flags") > > from the block tree and commit: > > 21e6ba3f0e02 ("scsi: sd: Rely on the driver core for asynchronous probing") > d16ece577bf2 ("scsi: sd: Inline sd_probe_part2()") > > from the scsi 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. Thanks Stephen for having resolved this conflict. The conflict resolution looks good to me. Bart.