From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752370AbbBLWvB (ORCPT ); Thu, 12 Feb 2015 17:51:01 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:5922 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752068AbbBLWu5 (ORCPT ); Thu, 12 Feb 2015 17:50:57 -0500 Message-ID: <54DD2E47.7060601@fb.com> Date: Thu, 12 Feb 2015 15:50:47 -0700 From: Jens Axboe User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Linus Torvalds , Tejun Heo , Ronny Hegewald , Dan Williams CC: Linux Kernel Mailing List Subject: Re: [GIT PULL] Block driver changes for 3.20 References: <20150212205752.GC24835@kernel.dk> In-Reply-To: Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.57.29] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-02-12_07:2015-02-12,2015-02-12,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=5.55111512312578e-17 kscore.compositescore=0 circleOfTrustscore=35.5369506609969 compositescore=0.939076664828693 urlsuspect_oldscore=0.939076664828693 suspectscore=0 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=64355 rbsscore=0.939076664828693 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.9 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1502120225 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/12/2015 03:37 PM, Linus Torvalds wrote: > On Thu, Feb 12, 2015 at 12:57 PM, Jens Axboe wrote: >> >> - Switching libata to use the new blk-mq tagging policy, removing code >> (and a suboptimal implementation) from libata. This will throw you a >> merge conflict, since a bug in the original libata tagging code was >> fixed since this code was branched. Trivial. From Shaohua. > > Somebody should still check my resolution, since the code had been > moved to another file. Tejun / Dan, it's your commit 72dd299d5039 > ("libata: allow sata_sil24 to opt-out of tag ordered submission") that > added a ATA_FLAG_LOWTAG, which conflicts with commit 98bd4be1ba95 > ("libata: move sas ata tag allocation to libata-scsi.c") that moved > the code. > > I verified that it all looks sane, and still compiles, but somebody > should verify that the tag allocation changes still *work*, > particularly for that sata_sil24 case. > > (I haven't pushed out quite yet, I'm waiting for the rest to compile > cleanly too, and then I'll do a local compile and boot to see that it > all works for me, but I'm writing this as a heads-up) When the code was moved, it also morphed into the sas specific tag allocation. And the LOWTAG part was for sil24, which doesn't call that code anymore. So either resolution is fine: 1) Drop the LOWTAG part of ata_sas_allocate_tag(), which is the easy resolve. Or, 2) Add the two LOWTAG lines in ata_sas_allocate_tag(). So don't worry too much about it, if it compiles, it's good... -- Jens Axboe