From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH 10/10] xen: arm: update multiboot device tree bindings. Date: Wed, 18 Jun 2014 16:24:42 +0100 Message-ID: <1403105082.6568.86.camel@kazak.uk.xensource.com> References: <1402919079.14907.22.camel@kazak.uk.xensource.com> <1402919103-29642-10-git-send-email-ian.campbell@citrix.com> <1403104621.6568.81.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Stefano Stabellini Cc: Naresh Bhat , julien.grall@linaro.org, tim@xen.org, xen-devel@lists.xen.org, Roy Franz , Fu Wei List-Id: xen-devel@lists.xenproject.org On Wed, 2014-06-18 at 16:22 +0100, Stefano Stabellini wrote: > On Wed, 18 Jun 2014, Ian Campbell wrote: > > On Wed, 2014-06-18 at 15:56 +0100, Stefano Stabellini wrote: > > > On Mon, 16 Jun 2014, Ian Campbell wrote: > > > > Signed-off-by: Ian Campbell > > > > --- > > > > docs/misc/arm/device-tree/booting.txt | 24 ++++++++++++++++++------ > > > > 1 file changed, 18 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt > > > > index bfb8d01..92af119 100644 > > > > --- a/docs/misc/arm/device-tree/booting.txt > > > > +++ b/docs/misc/arm/device-tree/booting.txt > > > > @@ -8,15 +8,27 @@ Each node contains the following properties: > > > > > > > > - compatible > > > > > > > > - Must be: > > > > + Must always include at least: > > > > > > > > - "xen,", "xen,multiboot-module" > > > > + "multiboot,module" > > > > > > As it stands this conflicts with the statement below that we are > > > compatible with Xen 4.4: the old multiboot compatible strings didn't > > > include "multiboot,module". > > > You might want to reword it. > > > > I'm not sure what you mean or I would. > > > > I don't think the doc says that we are compatible with Xen 4.4, it says > > that in order to be compatible with Xen 4.4 the user should... Is that > > what I need to clarify perhaps? > > The doc says "For compatibility with Xen 4.4 the following are also > supported". From that I assumed that we are compatible with Xen 4.4.... This is saying "in addition to what is described above we also support XXX for compatibility with a previous way of doing things". I wouldn't describe that as conflicting.