From: Randy Dunlap <randy.dunlap@oracle.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
xen-devel@lists.xensource.com, linux-next@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for October 20 (xen)
Date: Wed, 20 Oct 2010 10:21:05 -0700 [thread overview]
Message-ID: <4CBF2501.4030704@oracle.com> (raw)
In-Reply-To: <20101020170932.GB23458@dumpdata.com>
On 10/20/10 10:09, Konrad Rzeszutek Wilk wrote:
> On Wed, Oct 20, 2010 at 09:28:36AM -0700, Randy Dunlap wrote:
>> On Wed, 20 Oct 2010 16:20:53 +1100 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20101019:
>>>
>>>
>>> The swiotlb-xen tree gained a conflict against the pci tree.
>>
>>
>> linux-next-20101020/drivers/xen/biomerge.c: In function 'xen_biovec_phys_mergeable':
>> linux-next-20101020/drivers/xen/biomerge.c:8: error: dereferencing pointer to incomplete type
>> linux-next-20101020/drivers/xen/biomerge.c:9: error: dereferencing pointer to incomplete type
>> linux-next-20101020/drivers/xen/biomerge.c:11: error: implicit declaration of function '__BIOVEC_PHYS_MERGEABLE'
>
> Ok, this patch fixes it. I am sticking it in my tree:
Ack. Thanks.
> From 2d7d06dd8ffcbafc03bf2c1cb4b2fb2c4c405ec1 Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Wed, 20 Oct 2010 13:04:13 -0400
> Subject: [PATCH] xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
>
> Without this dependency we get these compile errors:
>
> linux-next-20101020/drivers/xen/biomerge.c: In function 'xen_biovec_phys_mergeable':
> linux-next-20101020/drivers/xen/biomerge.c:8: error: dereferencing pointer to incomplete type
> linux-next-20101020/drivers/xen/biomerge.c:9: error: dereferencing pointer to incomplete type
> linux-next-20101020/drivers/xen/biomerge.c:11: error: implicit declaration of function '__BIOVEC_PHYS_MERGEABLE'
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> drivers/xen/Makefile | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
> index b47f5da..b978645 100644
> --- a/drivers/xen/Makefile
> +++ b/drivers/xen/Makefile
> @@ -1,9 +1,10 @@
> -obj-y += grant-table.o features.o events.o manage.o biomerge.o
> +obj-y += grant-table.o features.o events.o manage.o
> obj-y += xenbus/
>
> nostackp := $(call cc-option, -fno-stack-protector)
> CFLAGS_features.o := $(nostackp)
>
> +obj-$(CONFIG_BLOCK) += biomerge.o
> obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o
> obj-$(CONFIG_XEN_XENCOMM) += xencomm.o
> obj-$(CONFIG_XEN_BALLOON) += balloon.o
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
next prev parent reply other threads:[~2010-10-20 17:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-20 5:20 linux-next: Tree for October 20 Stephen Rothwell
2010-10-20 16:28 ` linux-next: Tree for October 20 (xen) Randy Dunlap
2010-10-20 17:09 ` Konrad Rzeszutek Wilk
2010-10-20 17:21 ` Randy Dunlap [this message]
2010-10-21 13:09 ` linux-next: Tree for October 20 Christoph Hellwig
2010-10-21 13:21 ` Zimny Lech
2010-10-25 8:47 ` Michal Marek
2010-10-26 16:22 ` Arnaud Lacombe
2010-10-27 21:20 ` Michal Marek
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=4CBF2501.4030704@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=xen-devel@lists.xensource.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).