linux-kernel - linux-next: manual merge of the usb-gadget tree with the usb.current tree

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>] [day] [month] [year] [list]

Message-ID: <20150528183617.432ba4f4@canb.auug.org.au>
Date:	Thu, 28 May 2015 18:36:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felipe Balbi <balbi@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ben Hutchings <ben@...adent.org.uk>,
	Hans de Goede <hdegoede@...hat.com>
Subject: linux-next: manual merge of the usb-gadget tree with the
 usb.current tree

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_core.c between commit da96cfc13335 ("usb: musb:
fix order of conditions for assigning end point operations") from the
usb.current tree and commit 47a82730b54c ("usb: musb: Fix platform code
being unable to override ep access ops") from the usb-gadget tree.

I fixed it up (they are the same patch apart from whitespace and the
comments - I used the comments from the usb-gadget tree) and can carry
the fix as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped