linux-kernel - Re: linux-next: manual merge of the usb-gadget tree with the usb 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20140428161110.GL30292@saruman.home>
Date:	Mon, 28 Apr 2014 11:11:10 -0500
From:	Felipe Balbi <balbi@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Felipe Balbi <balbi@...com>, Greg KH <greg@...ah.com>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Paul Bolle <pebolle@...cali.nl>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree

On Mon, Apr 28, 2014 at 03:20:44PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-mv-u3d-usb.c between commit 543cab640279 ("usb: phy:
> mv_u3d: Remove usb phy driver for mv_u3d") from the usb tree and commit
> 041832565e40 ("usb: phy: mv-u3d: switch over to writel/readl") from the
> usb-gadget tree.
> 
> I fixed it up (the former removes the file, so I did that) and can carry
> the fix as necessary (no action is required).

I actually rejected that patch as you can see from the archives:

http://marc.info/?l=linux-usb&m=139758276329167&w=2

I said that it doesn't break anything and can even build in any
architecture if we switch over to writel/readl instead of _relaxed
versions which are only available on ARM (afaict).

Greg, looks like this commit went in your tree by mistake.

cheers

-- 
balbi

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)