linux-kernel - linux-next: manual merge of the usb-gadget-fixes 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20150112111339.591e766e@canb.auug.org.au>
Date:	Mon, 12 Jan 2015 11:13:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felipe Balbi <balbi@...com>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Maxime Ripard <maxime.ripard@...e-electrons.com>,
	Thierry Reding <treding@...dia.com>
Subject: linux-next: manual merge of the usb-gadget-fixes tree with the
 usb.current tree

Hi Felipe,

Today's linux-next merge of the usb-gadget-fixes tree got a conflict in
drivers/usb/phy/phy.c between commit 9c9d82492b73 ("usb: phy: Fix
deferred probing") from the usb.current tree and commit c818a94c77a9
("usb: phy: Restore deferred probing path") from the usb-gadget-fixes
tree.

These seem to try to fix the same problem (from reading their commit messages).

I fixed it up (I used the version from the usb-gadget-fixes 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