linux-kernel - Re: [GIT PULL] USB driver patches for 3.19-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141215101754.31e2ae56@canb.auug.org.au>
Date:	Mon, 15 Dec 2014 10:17:54 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Greg KH <gregkh@...uxfoundation.org>,
	Christoph Hellwig <hch@....de>,
	Hans de Goede <hdegoede@...hat.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	USB list <linux-usb@...r.kernel.org>
Subject: Re: [GIT PULL] USB driver patches for 3.19-rc1

Hi Linus,

On Sun, 14 Dec 2014 15:06:07 -0800 Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
> On Sun, Dec 14, 2014 at 2:35 PM, Greg KH <gregkh@...uxfoundation.org> wrote:
> >
> > Hans de Goede (1):
> >       uas: Make uas work with blk-mq
> 
> So I got some fairly trivial conflicts on this one (conflicting with
> the scsi cleanups mainly by Christoph Hellwig.
> 
> I resolved the conflict easily, and it all *looks* fine, but quite
> frankly, I'd be a lot happier about it if somebody who has the
> hardware were to actually test the end result.   The whole interaction
> with ".use_blk_tags" etc should be verified by somebody who knows the
> code.
> 
> Hans? Christoph?

Attached is the message I sent about this on Nov 24 to which I received
no response and so assumed it was ok ...
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:
CFG:
PT:0
S:sfr@...b.auug.org.au
RQ:
SSV:ozlabs.org
NSV:
SSH:
R:<James.Bottomley@...senPartnership.com>,<linux-next@...r.kernel.org>,<linux-kernel@...r.kernel.org>,<hdegoede@...hat.com>,<greg@...ah.com>,<hch@....de>
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: Fri, 14 Nov 2014 18:00:54 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: James Bottomley <James.Bottomley@...senPartnership.com>, Greg KH
 <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Hans de Goede
 <hdegoede@...hat.com>, Christoph Hellwig <hch@....de>
Subject: linux-next: manual merge of the scsi tree with the usb tree
Message-ID: <20141114180054.77fbbc7b@...b.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_/RLU61p/c5uqQ3RrTNO04.PU"; protocol="application/pgp-signature"

--Sig_/RLU61p/c5uqQ3RrTNO04.PU
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/usb/storage/uas.c between commit e28e2f2f7c42 ("uas: Make uas
work with blk-mq") from the usb tree and commits 125c99bc8b6b ("scsi:
add new scsi-command flag for tagged commands"), abd0c533e377
("scsi: remove ordered_tag host template field") and 2ecb204d07ac
("scsi: always assign block layer tags if enabled") from the scsi tree.

I fixed it up (maybe, please check - see below) and can carry the fix
as necessary (no action is required).

--=20
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/usb/storage/uas.c
index 004ebc12bc21,33f211b56a42..000000000000
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@@ -806,7 -816,14 +805,7 @@@ static struct scsi_host_template uas_ho
  	.sg_tablesize =3D SG_NONE,
  	.cmd_per_lun =3D 1,	/* until we override it */
  	.skip_settle_delay =3D 1,
- 	.ordered_tag =3D 1,
 -
 -	/*
 -	 * The uas drivers expects tags not to be bigger than the maximum
 -	 * per-device queue depth, which is not true with the blk-mq tag
 -	 * allocator.
 -	 */
 -	.disable_blk_mq =3D true,
+ 	.use_blk_tags =3D 1,
  };
 =20
  #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \

--Sig_/RLU61p/c5uqQ3RrTNO04.PU
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJUZaitAAoJEMDTa8Ir7ZwVfhAQAIXnmGYFDuRRNsA1By3WaWpW
coUAbNQd54Avb8EAh0IuPkVNeL1G+wVwZmBP03KWrV9onKvlYJ3UCWD+VFKEuwAX
jJL4GC2nHKRebH4CRVYIa1BFjjJ3wYILVozqIrhmkZ9nwD0VHtx7T6gfOxbXuSvX
DChYNYQ7Kvzh7X64nnAdcZr/zv+RCTeRVfbdHwwxrQ83fTORkLKC6aW1E5oym7gR
dzEHU4yPTYiF3tnbRy8pDrgtnTcEaju7dcNdWYzoCaoJPfk6DhrgW2ez6Do33bju
1Vnv9KkSyhi6/H0s/AD9C/kZOv1LB/yE4GPhfPHR6pnSgrlqKPfkiAQYTA5pfkL2
snMphZtZYRfz6dGCHccTLaIN3N3O5Mnk6N0K7TfPsmvuNUAx060E+H1VPO0skc5s
rX89UgPi1BSG7IJFCjjwVijdfdAKMe4AKUGU7XpM7fWUBI5epHjfyPgHPlZ4enMV
zsZuC9ouudVzTTwYlPjxL4Q/eqbs5A5hpUDAB4dnw2181ledYC3zuT4JXAgJ2AMn
j2N+0QfnUwcw1MVH1cm34VdZ8Ja9uaOTHacCkygi5q/iIQIx7ZwMSDv+L12vxMqb
wlsC5a90tqpYsyn6p757FvICfb3ulg22HFLB1l8FlOCsDdV0GkMcIzFzU5H/+nqa
bk9RYxKVXDid9Fxajx9x
=49dI
-----END PGP SIGNATURE-----

--Sig_/RLU61p/c5uqQ3RrTNO04.PU--


Content of type "application/pgp-signature" skipped