linux-kernel - Re: [GIT PULL] phy: for v4.2 merge window

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

Message-ID: <20150603051423.GB26680@kroah.com>
Date:	Wed, 3 Jun 2015 14:14:23 +0900
From:	Greg KH <gregkh@...uxfoundation.org>
To:	Kishon Vijay Abraham I <kishon@...com>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] phy: for v4.2 merge window

On Tue, Jun 02, 2015 at 08:13:31PM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> Here's the PHY pull request for 4.2 merge window. Please find below
> the list of changes that goes in this pull request.
> 
> There was a merge conflict in Makefile and Kconfig while trying to merge
> with your usb-next branch. It's because one of the PHY drivers (TUSB1210)
> went via balbi's tree due to it's dependecy with USB_ULPI_BUS and it
> conflicts with BRCMSTB_SATA. The resolution should have both TUSB1210 and
> BRCMSTB_SATA present.
> 
> Let me know If I have to change something.

Nope, that should be fine.  I've pulled and pushed out the tree now,
please verify I did the merge correctly.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/