This message generated a parse failure. Raw output follows here. Please use 'back' to navigate. From devnull@lkml.org Sun May 19 08:08:32 2024 >From spaans Thu Feb 12 23:45:47 2015 Received: from pop.ziggo.nl [212.54.42.19] by squeeze.vs19.net with POP3 (fetchmail-6.3.21) for (single-drop); Thu, 12 Feb 2015 23:45:47 +0100 (CET) Received: from md3.tb.mail.iss.local ([212.54.42.143]) by mc5.tb.mail.iss.local (Dovecot) with LMTP id /r4WBTAs3VRNHgAAh0Kp1A for ; Thu, 12 Feb 2015 23:42:47 +0100 Received: from mx16.tb.mail.iss.as9143.net ([212.54.42.143]) by md3.tb.mail.iss.local (Dovecot) with LMTP id sTHUMh3vgFQ+TQAAGeRBqA ; Thu, 12 Feb 2015 23:38:31 +0100 Received: from vger.kernel.org ([209.132.180.67]) by mx16.tb.mail.iss.as9143.net with esmtp (Exim 4.82) (envelope-from ) id 1YM2T8-0004DG-E4 for bmw12-lkml@ziggo.nl; Thu, 12 Feb 2015 23:42:47 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752424AbbBLWmf (ORCPT ); Thu, 12 Feb 2015 17:42:35 -0500 Received: from ozlabs.org ([103.22.144.67]:38779 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750959AbbBLWme (ORCPT ); Thu, 12 Feb 2015 17:42:34 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id CF2FC14017D; Fri, 13 Feb 2015 09:42:31 +1100 (AEDT) Date: Fri, 13 Feb 2015 09:42:26 +1100 From: Stephen Rothwell To: Cc: Jens Axboe , Subject: Re: [GIT PULL] Block driver changes for 3.20 Message-Id: <20150213094226.48c21c82@canb.auug.org.au> In-Reply-To: <20150212205752.GC24835@kernel.dk> References: <20150212205752.GC24835@kernel.dk> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/+wB55AA0w/8LB6foRkh4Au4"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-Id: X-Mailing-List: linux-kernel@vger.kernel.org X-Ziggo-spamsetting: Instelling=Gemiddeld Scorelimiet=14 X-Ziggo-spambar: / X-Ziggo-spamscore: -0.4 X-Ziggo-spamreport: BAYES_00=-1.9,CM_SPACED_DATE=0.5,HEADER_FROM_DIFFERENT_DOMAINS=0.001,L_TAB_IN_FROM=2,RCVD_IN_JMF_W=-1,RCVD_IN_MSPIKE_H3=-0.01,RCVD_IN_MSPIKE_WL=-0.01,T_RP_MATCHES_RCVD=-0.01,T_TVD_MIME_EPI=0.01 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No --Sig_/+wB55AA0w/8LB6foRkh4Au4 Content-Type: multipart/mixed; boundary="MP_/aS=4oIbery6LShC8SJcw3YW" --MP_/aS=4oIbery6LShC8SJcw3YW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi Linus, On Thu, 12 Feb 2015 13:57:52 -0700 Jens Axboe wrote: > > Shaohua Li (3): > libata: move sas ata tag allocation to libata-scsi.c So, I assume you figured out the attached semantic conflict ... --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --MP_/aS=4oIbery6LShC8SJcw3YW Content-Type: message/rfc822 Content-Transfer-Encoding: binary Content-Disposition: inline AF: NF:0 PS:10 SRH:1 SFN: DSR: MID:<20150127144825.7fd056c3@canb.auug.org.au> CFG: PT:0 S:sfr@canb.auug.org.au RQ: SSV:ipv4.ozlabs.org NSV: SSH: R:,,,,, MAID:2 X-Claws-Privacy-System:pgpmime X-Claws-Sign:1 SCF:#imap/ozlabs.org/Sent X-Claws-Auto-Wrapping:0 X-Claws-Auto-Indent:0 X-Claws-End-Special-Headers: 1 Date: Tue, 27 Jan 2015 15:03:32 +1100 From: Stephen Rothwell To: Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shaohua Li , Dan Williams , Tejun Heo Subject: linux-next: manual merge of the block tree with Linus' tree Message-ID: <20150127150332.64d614da@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/XQJwcs.KCeg6e3Ull1r8MF3"; protocol="application/pgp-signature" --Sig_/XQJwcs.KCeg6e3Ull1r8MF3 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/ata/libata-core.c between commit 72dd299d5039 ("libata: allow sata_sil24 to opt-out of tag ordered submission") from Linus' tree and commit 98bd4be1ba95 ("libata: move sas ata tag allocation to libata-scsi.c") from the block tree. I fixed it up (I used the version from the block tree and then added the following patch) and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Tue, 27 Jan 2015 14:59:51 +1100 Subject: [PATCH] libata: fix for move of sas tag allocation code Signed-off-by: Stephen Rothwell --- drivers/ata/libata-scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index fd9be1756f0d..055e75d2176e 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -4240,7 +4240,10 @@ int ata_sas_allocate_tag(struct ata_port *ap) unsigned int i, tag; =20 for (i =3D 0, tag =3D ap->sas_last_tag + 1; i < max_queue; i++, tag++) { - tag =3D tag < max_queue ? tag : 0; + if (ap->flags & ATA_FLAG_LOWTAG) + tag =3D i; + else + tag =3D tag < max_queue ? tag : 0; =20 /* the last tag is reserved for internal command. */ if (tag =3D=3D ATA_TAG_INTERNAL) --=20 2.1.4 --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/XQJwcs.KCeg6e3Ull1r8MF3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUxw4ZAAoJEMDTa8Ir7ZwVYjgQAIldHKHuOcmjxId42fG1E59j iLpNP5ie2niIoaUrlpKQ7xaiAxQc18etOSkt6m8L8UowSCiYW4/h6d0qvhmNX+sW 5ZtSmM4D4dRtWBuoLGpn1bD8VhGv8+5vuYVJ5n1BFVYQZpc2T8jyD58QzQAMPYfq u0A/JK2GQWxWCG4DbQygO6kSGGLAEktL7s39p8YOZXBeTFElj5G4/8x/dFfEYfZw qnIqSKyHMLA8xrn/T+31k9IyfuBe6xWkttppFHdmG3oehtvY8yNe2SRUw7byLVWi P61K9/T3ag9sIhzQW6nQKJcQUWwAZ3tLzKMXlnREqlIP/KK5+LIrqAjFk5JGgkRz zUNZuVNZbUM8PkTGvLsrNk7MRUFFUoimSmLef3PmvOxI6TbNXkIr5iFcgvwrH8SR UDZ4ju4XMxsz2iOP7BWsg4mKOndaPB+RIKSWzfcmkhYVSOH+MpspxruFRd8QEMt9 zuNS2y39baszQC4Sy4QpKfGM1PxI4Uh7iZqfXMLmfokVDVMBKOsYWYdqHsl/1Ihz 9rK7zocWCkqwgEgg+FtuOzuxwRniqiqPdqcicCqDQPz085V8aedOkIe5raYY12P3 8FFr7evg11Fw2xNK7tGIQ/hlu/oz76y0RGtrQnsa/VZddfnjHvkReJMcvl4scm8a jaDdEGYiOdpUAqOp6vEi =MMMN -----END PGP SIGNATURE----- --Sig_/XQJwcs.KCeg6e3Ull1r8MF3-- --MP_/aS=4oIbery6LShC8SJcw3YW-- --Sig_/+wB55AA0w/8LB6foRkh4Au4 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJU3SxXAAoJEMDTa8Ir7ZwVt+sP/Rho6IZHMcuqKyWcSLCv090F LYwpab3Fe4U7+KlndmnhHmHk7bZMunfRHBUu9atkLXxsXv1ItU7A7c8AZ30y8ekl noW9My2KiwXwwMyyPYA09O5AI9mko8D5oH+nrf+GONHEtYJiiXthvygA951uIV3n ILw3ZH/p/DRJj7Q79mpPBKoQsWj0651VI5cHUKEk6RUZ2MlzJ9GfTec73MjKA5ED b2U746JJP6hXh4jY6ZOdkRQIk96kn0vMU8trbhjBbrqqhnfyd5F4g6jCodHd4yOD 2VhmKefe3PLtrtD+KFivK4W1K1dk2Zoai9me8AMj3gBklJHbokFvWH4JVuf2TqBs 9ioy04RzdeTEi19/q4+F07s9aTpdTgDo3XZhrWO+bjUilwxdyGBdeiKEqk+lzrnA XX0G1OSjm2eohVbwQlTZYFbiZUg44Wn6yeA8e1bALGKsHtjq2nK6zQUq6i9DJlBK 1ffuyNVougvUoUCmTRFWCeplaaVjRC6ZISAVM4sKC0X83g0tzHqz5XWDUe+95dmi wyo9TOz9GLx0UGiKPXYxbsEhBQFKnMXfeDhi93QZ8DFe/yV8TtwC34pdI9c90LRn m8gcDFsTQYKa3Dgm6iLfvXTGCKqwmlXnuz82yKEC6hocFxOahLHceTReBK3q1TdQ V/lP9463nALrM28lI41N =4sUS -----END PGP SIGNATURE----- --Sig_/+wB55AA0w/8LB6foRkh4Au4-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/