From: Arnd Bergmann <arnd@arndb.de>
To: "ABRAHAM, KISHON VIJAY" <kishon@ti.com>
Cc: Greg KH <gregkh@linuxfoundation.org>, Felipe Balbi <balbi@ti.com>,
grant.likely@secretlab.ca, rob.herring@calxeda.com,
rob@landley.net, linux@arm.linux.org.uk, b-cousson@ti.com,
rnayak@ti.com, tony@atomide.com,
devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-usb@vger.kernel.org
Subject: Re: [PATCH v7 1/7] drivers: usb: phy: add a new driver for omap usb2 phy
Date: Thu, 6 Sep 2012 13:03:02 +0000 [thread overview]
Message-ID: <201209061303.02454.arnd@arndb.de> (raw)
In-Reply-To: <CAAe_U6KBNZpT03xATmPTNTgxm5hj+wJdsShdnm08EmF4Q=hTCw@mail.gmail.com>
On Thursday 06 September 2012, ABRAHAM, KISHON VIJAY wrote:
> > diff --git a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
> > index d2fe064..bb0c7f4 100644
> > --- a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
> > +++ b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
> > @@ -8,3 +8,6 @@ properties:
> >
> > Sub-nodes:
> > All the devices connected to ocp2scp are described using sub-node to ocp2scp
> > +- usb2phy :
> > + The binding details of usb2phy can be found in:
> > + Documentation/devicetree/bindings/usb/omap-usb.txt
>
> The above two lines should be added in omap-ocp2scp.txt (this file was
> added as part of omap: add ocp2scp as a bus driver and is in
> linux-next). However this file is still not in Felipe's xceiv branch.
> So I'm not sure how I can get this patch merged in Felipe's tree
> without conflict.
>
There are three possible ways to do that:
* Not add that text. Is is actually required? The ocp2scp bus driver
doesn't actually care what is connected to it, does it?
* Ask Felipe to merge the drivers/ocp2scp branch from arm-soc into
his branch, then apply your patch on top. The branch is scheduled
for merging in 3.7 and is stable, so there is no harm merging it
into his tree, as long as Olof and I are aware of this.
* Split out this change and apply the patch to add this documentation
change on top of the drivers/ocp2scp branch in the arm-soc tree.
There is no strict dependency between this change and the others
you want to merge, so it does not matter which tree it is merged through.
Arnd
next prev parent reply other threads:[~2012-09-06 13:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-06 13:07 [PATCH v7 0/7] omap: musb: Add device tree support Kishon Vijay Abraham I
2012-08-06 13:07 ` [PATCH v7 1/7] drivers: usb: phy: add a new driver for omap usb2 phy Kishon Vijay Abraham I
2012-09-06 12:15 ` ABRAHAM, KISHON VIJAY
2012-09-06 13:03 ` Arnd Bergmann [this message]
2012-09-06 13:16 ` Felipe Balbi
2012-08-06 13:07 ` [PATCH v7 2/7] arm: omap: hwmod: add a new addr space in otg for writing to control module Kishon Vijay Abraham I
2012-08-06 13:07 ` [PATCH v7 3/7] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
2012-08-06 13:07 ` [PATCH v7 4/7] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
2012-08-06 13:07 ` [PATCH v7 5/7] drivers: usb: twl4030: Add device tree support for twl4030 usb Kishon Vijay Abraham I
2012-08-06 13:07 ` [PATCH v7 6/7] drivers: usb: musb: Add device tree support for omap musb glue Kishon Vijay Abraham I
2012-08-06 13:08 ` [PATCH v7 7/7] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201209061303.02454.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rnayak@ti.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).