Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1157076
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Greg KH <gregkh@linuxfoundation.org> |
| Newsgroups | linux.kernel |
| Subject | Re: [GIT PULL] phy: for v4.2 merge window |
| Date | Wed, 03 Jun 2015 07:20:02 +0200 |
| Message-ID | <px9fQ-7Db-3@gated-at.bofh.it> (permalink) |
| References | <pwVFT-4bY-9@gated-at.bofh.it> |
| X-Original-To | Kishon Vijay Abraham I <kishon@ti.com> |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=us-ascii |
| Content-Disposition | inline |
| User-Agent | Mutt/1.5.23 (2014-03-12) |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 25 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-kernel@vger.kernel.org |
| X-Original-Date | Wed, 3 Jun 2015 14:14:23 +0900 |
| X-Original-Message-ID | <20150603051423.GB26680@kroah.com> |
| X-Original-References | <1433256225-476-1-git-send-email-kishon@ti.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | aioe.org linux.kernel:1157076 |
Show key headers only | View raw
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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
Re: [GIT PULL] phy: for v4.2 merge window Greg KH <gregkh@linuxfoundation.org> - 2015-06-03 07:20 +0200 Re: [GIT PULL] phy: for v4.2 merge window Kishon Vijay Abraham I <kishon@ti.com> - 2015-06-03 07:40 +0200
csiph-web