Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1449073 > unrolled thread

linux-next: manual merge of the xen-tip tree with the block tree

Started byStephen Rothwell <sfr@canb.auug.org.au>
First post2016-07-24 08:20 +0200
Last post2016-07-26 00:30 +0200
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the xen-tip tree with the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-24 08:20 +0200
    Re: linux-next: manual merge of the xen-tip tree with the block  tree Stefano Stabellini <sstabellini@kernel.org> - 2016-07-25 19:30 +0200
      Re: linux-next: manual merge of the xen-tip tree with the block  tree Stefano Stabellini <sstabellini@kernel.org> - 2016-07-26 00:30 +0200
      Re: linux-next: manual merge of the xen-tip tree with the block tree Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-07-26 00:30 +0200
        Re: linux-next: manual merge of the xen-tip tree with the block  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-26 07:00 +0200
      Re: linux-next: manual merge of the xen-tip tree with the block  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-26 00:30 +0200

#1449073 — linux-next: manual merge of the xen-tip tree with the block tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-07-24 08:20 +0200
Subjectlinux-next: manual merge of the xen-tip tree with the block tree
Message-ID<rYkVz-4mo-1@gated-at.bofh.it>
Hi all,

Today's linux-next merge of the xen-tip tree got a conflict in:

  drivers/block/xen-blkfront.c

between commit:

  a418090aa88b ("block: do not use REQ_FLUSH for tracking flush support")

from the block tree and commit:

  ff595325ed55 ("xen-blkfront: prefer xenbus_scanf() over xenbus_gather()")

from the xen-tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/block/xen-blkfront.c
index ab382c7997b8,ca0536eb7037..000000000000
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@@ -2298,11 -2308,9 +2297,10 @@@ static void blkfront_gather_backend_fea
  	unsigned int indirect_segments;
  
  	info->feature_flush = 0;
 +	info->feature_fua = 0;
  
- 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
- 			"feature-barrier", "%d", &barrier,
- 			NULL);
+ 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
+ 			   "feature-barrier", "%d", &barrier);
  
  	/*
  	 * If there's no "feature-barrier" defined, then it means
@@@ -2311,35 -2319,27 +2309,32 @@@
  	 *
  	 * If there are barriers, then we use flush.
  	 */
- 	if (!err && barrier) {
 -	if (err > 0 && barrier)
 -		info->feature_flush = REQ_FLUSH | REQ_FUA;
++	if (err > 0 && barrier) {
 +		info->feature_flush = 1;
 +		info->feature_fua = 1;
 +	}
 +
  	/*
  	 * And if there is "feature-flush-cache" use that above
  	 * barriers.
  	 */
- 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
- 			"feature-flush-cache", "%d", &flush,
- 			NULL);
+ 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
+ 			   "feature-flush-cache", "%d", &flush);
  
- 	if (!err && flush) {
 -	if (err > 0 && flush)
 -		info->feature_flush = REQ_FLUSH;
++	if (err > 0 && flush) {
 +		info->feature_flush = 1;
 +		info->feature_fua = 0;
 +	}
  
- 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
- 			"feature-discard", "%d", &discard,
- 			NULL);
+ 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
+ 			   "feature-discard", "%d", &discard);
  
- 	if (!err && discard)
+ 	if (err > 0 && discard)
  		blkfront_setup_discard(info);
  
- 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
- 			"feature-persistent", "%u", &persistent,
- 			NULL);
- 	if (err)
+ 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
+ 			   "feature-persistent", "%d", &persistent);
+ 	if (err <= 0)
  		info->feature_persistent = 0;
  	else
  		info->feature_persistent = persistent;

[toc] | [next] | [standalone]

#1449668 — Re: linux-next: manual merge of the xen-tip tree with the block tree

FromStefano Stabellini <sstabellini@kernel.org>
Date2016-07-25 19:30 +0200
SubjectRe: linux-next: manual merge of the xen-tip tree with the block tree
Message-ID<rYRRv-7m5-9@gated-at.bofh.it>
In reply to#1449073
On Sun, 24 Jul 2016, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the xen-tip tree got a conflict in:
> 
>   drivers/block/xen-blkfront.c
> 
> between commit:
> 
>   a418090aa88b ("block: do not use REQ_FLUSH for tracking flush support")
> 
> from the block tree and commit:
> 
>   ff595325ed55 ("xen-blkfront: prefer xenbus_scanf() over xenbus_gather()")
> 
> from the xen-tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Hello Stephen,

thanks for letting us know, the fix is good.

The To and CC list for these emails is a bit outdated. I want to make
sure they reach the right people. Could you please add:

boris.ostrovsky@oracle.com
david.vrabel@citrix.com

Thanks!

 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/block/xen-blkfront.c
> index ab382c7997b8,ca0536eb7037..000000000000
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@@ -2298,11 -2308,9 +2297,10 @@@ static void blkfront_gather_backend_fea
>   	unsigned int indirect_segments;
>   
>   	info->feature_flush = 0;
>  +	info->feature_fua = 0;
>   
> - 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
> - 			"feature-barrier", "%d", &barrier,
> - 			NULL);
> + 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> + 			   "feature-barrier", "%d", &barrier);
>   
>   	/*
>   	 * If there's no "feature-barrier" defined, then it means
> @@@ -2311,35 -2319,27 +2309,32 @@@
>   	 *
>   	 * If there are barriers, then we use flush.
>   	 */
> - 	if (!err && barrier) {
>  -	if (err > 0 && barrier)
>  -		info->feature_flush = REQ_FLUSH | REQ_FUA;
> ++	if (err > 0 && barrier) {
>  +		info->feature_flush = 1;
>  +		info->feature_fua = 1;
>  +	}
>  +
>   	/*
>   	 * And if there is "feature-flush-cache" use that above
>   	 * barriers.
>   	 */
> - 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
> - 			"feature-flush-cache", "%d", &flush,
> - 			NULL);
> + 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> + 			   "feature-flush-cache", "%d", &flush);
>   
> - 	if (!err && flush) {
>  -	if (err > 0 && flush)
>  -		info->feature_flush = REQ_FLUSH;
> ++	if (err > 0 && flush) {
>  +		info->feature_flush = 1;
>  +		info->feature_fua = 0;
>  +	}
>   
> - 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
> - 			"feature-discard", "%d", &discard,
> - 			NULL);
> + 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> + 			   "feature-discard", "%d", &discard);
>   
> - 	if (!err && discard)
> + 	if (err > 0 && discard)
>   		blkfront_setup_discard(info);
>   
> - 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
> - 			"feature-persistent", "%u", &persistent,
> - 			NULL);
> - 	if (err)
> + 	err = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
> + 			   "feature-persistent", "%d", &persistent);
> + 	if (err <= 0)
>   		info->feature_persistent = 0;
>   	else
>   		info->feature_persistent = persistent;
>

[toc] | [prev] | [next] | [standalone]

#1450133 — Re: linux-next: manual merge of the xen-tip tree with the block tree

FromStefano Stabellini <sstabellini@kernel.org>
Date2016-07-26 00:30 +0200
SubjectRe: linux-next: manual merge of the xen-tip tree with the block tree
Message-ID<rYWxQ-25U-19@gated-at.bofh.it>
In reply to#1449668
On Tue, 26 Jul 2016, Stephen Rothwell wrote:
> Hi Stefano,
> 
> On Mon, 25 Jul 2016 10:29:11 -0700 (PDT) Stefano Stabellini <sstabellini@kernel.org> wrote:
> >
> > The To and CC list for these emails is a bit outdated. I want to make
> > sure they reach the right people. Could you please add:
> > 
> > boris.ostrovsky@oracle.com
> > david.vrabel@citrix.com
> 
> OK, I have added them as contacts for the xen-tip tree.  The complete list is now:
> 
> Jeremy Fitzhardinge <jeremy@goop.org>
> Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Stefano Stabellini <sstabellini@kernel.org>
> <boris.ostrovsky@oracle.com>
> <david.vrabel@citrix.com>
> Xen Devel <Xen-devel@lists.xensource.com>
> 
> Please let me know if you need further changes.

Thanks, I'll do!

[toc] | [prev] | [next] | [standalone]

#1450139

FromBoris Ostrovsky <boris.ostrovsky@oracle.com>
Date2016-07-26 00:30 +0200
Message-ID<rYWxQ-25U-27@gated-at.bofh.it>
In reply to#1449668
On 07/25/2016 06:19 PM, Stephen Rothwell wrote:
> Hi Stefano,
>
> On Mon, 25 Jul 2016 10:29:11 -0700 (PDT) Stefano Stabellini <sstabellini@kernel.org> wrote:
>> The To and CC list for these emails is a bit outdated. I want to make
>> sure they reach the right people. Could you please add:
>>
>> boris.ostrovsky@oracle.com
>> david.vrabel@citrix.com
> OK, I have added them as contacts for the xen-tip tree.  The complete list is now:
>
> Jeremy Fitzhardinge <jeremy@goop.org>

Jeremy is no longer involved with Xen. However,

Juergen Gross <jgross@suse.com>

is also Linux Xen/x86 maintainer.

-boris


> Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Stefano Stabellini <sstabellini@kernel.org>
> <boris.ostrovsky@oracle.com>
> <david.vrabel@citrix.com>
> Xen Devel <Xen-devel@lists.xensource.com>
>
> Please let me know if you need further changes.
>

[toc] | [prev] | [next] | [standalone]

#1450376 — Re: linux-next: manual merge of the xen-tip tree with the block tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-07-26 07:00 +0200
SubjectRe: linux-next: manual merge of the xen-tip tree with the block tree
Message-ID<rZ2Dg-5Zq-9@gated-at.bofh.it>
In reply to#1450139
Hi Boris,

On Mon, 25 Jul 2016 18:25:00 -0400 Boris Ostrovsky <boris.ostrovsky@oracle.com> wrote:
>
> > Jeremy Fitzhardinge <jeremy@goop.org>  
> 
> Jeremy is no longer involved with Xen. However,
> 
> Juergen Gross <jgross@suse.com>
> 
> is also Linux Xen/x86 maintainer.

I have replaced Jeremy with Juergen.

-- 
Cheers,
Stephen Rothwell

[toc] | [prev] | [next] | [standalone]

#1450144 — Re: linux-next: manual merge of the xen-tip tree with the block tree

FromStephen Rothwell <sfr@canb.auug.org.au>
Date2016-07-26 00:30 +0200
SubjectRe: linux-next: manual merge of the xen-tip tree with the block tree
Message-ID<rYWxQ-25U-21@gated-at.bofh.it>
In reply to#1449668
Hi Stefano,

On Mon, 25 Jul 2016 10:29:11 -0700 (PDT) Stefano Stabellini <sstabellini@kernel.org> wrote:
>
> The To and CC list for these emails is a bit outdated. I want to make
> sure they reach the right people. Could you please add:
> 
> boris.ostrovsky@oracle.com
> david.vrabel@citrix.com

OK, I have added them as contacts for the xen-tip tree.  The complete list is now:

Jeremy Fitzhardinge <jeremy@goop.org>
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Stefano Stabellini <sstabellini@kernel.org>
<boris.ostrovsky@oracle.com>
<david.vrabel@citrix.com>
Xen Devel <Xen-devel@lists.xensource.com>

Please let me know if you need further changes.

-- 
Cheers,
Stephen Rothwell

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web