linux-kernel - Re: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes 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: <20140822204841.GK27616@saruman.home>
Date:	Fri, 22 Aug 2014 15:48:41 -0500
From:	Felipe Balbi <balbi@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Felipe Balbi <balbi@...com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Jingoo Han <jg1.han@...sung.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the
 usb-gadget-fixes tree

On Sat, Aug 23, 2014 at 05:57:23AM +1000, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
> phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from the
> usb-gadget-fixes tree and commit 0dafc3d94596 ("usb: phy: samsung:
> Remove unnecessary lines of register bit definitions") from the
> usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thank you, I'll fix it up the same way once my fixes branch is merged
upstream :-)

-- 
balbi

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