linux-next: manual merge of the md tree with the tree

linux-next: manual merge of the md tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

Hi Neil,

Today's linux-next merge of the md tree got a conflict in
drivers/md/raid5.c between commit
0e6e0271a210817e202c8a4bfffbde3e3c0616d1 ("md/raid5: fix bug in reshape
code when chunk_size decreases") from the md-current tree and commit
dbf4da18b39fd412a76c3e1b9d7b29c8cc0197fb ("md: convert conf->chunk_size
and conf->prev_chunk to sectors") from the md tree.

Overlapping changes.  I used the version from the md-current tree
(stripe_addr+reshape_sectors) as it appears to be newer.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the md tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

Hi Neil,

Today's linux-next merge of the md tree got a conflict in
drivers/md/raid1.c between commit 4f024f3797c4 ("block: Abstract out bvec
iterator") from the block tree and commit 41a336e01188 ("md/raid1: fix
request counting bug in new 'barrier' code") from the md tree.

I fixed it up (a line fixed in the latter was removed by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the md tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1682 bytes --]

Hi Neil,

Today's linux-next merge of the md tree got a conflict in fs/bio.c
between commit 4363ac7c13a9 ("block: Implement support for WRITE SAME")
from the block tree and commit 368e564836d3 ("block: makes bio_split
support bio without data") from the md tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/bio.c
index f855e0e,dbb7a6c..0000000
--- a/fs/bio.c
+++ b/fs/bio.c
@@@ -1485,20 -1511,19 +1485,21 @@@ struct bio_pair *bio_split(struct bio *
  	bp->bio2.bi_size -= first_sectors << 9;
  	bp->bio1.bi_size = first_sectors << 9;
  
- 	bp->bv1 = bi->bi_io_vec[0];
- 	bp->bv2 = bi->bi_io_vec[0];
- 
- 	if (bio_is_rw(bi)) {
- 		bp->bv2.bv_offset += first_sectors << 9;
- 		bp->bv2.bv_len -= first_sectors << 9;
- 		bp->bv1.bv_len = first_sectors << 9;
- 	}
+ 	if (bi->bi_vcnt != 0) {
+ 		bp->bv1 = bi->bi_io_vec[0];
+ 		bp->bv2 = bi->bi_io_vec[0];
 -		bp->bv2.bv_offset += first_sectors << 9;
 -		bp->bv2.bv_len -= first_sectors << 9;
 -		bp->bv1.bv_len = first_sectors << 9;
++		if (bio_is_rw(bi)) {
++			bp->bv2.bv_offset += first_sectors << 9;
++			bp->bv2.bv_len -= first_sectors << 9;
++			bp->bv1.bv_len = first_sectors << 9;
++		}
  
- 	bp->bio1.bi_io_vec = &bp->bv1;
- 	bp->bio2.bi_io_vec = &bp->bv2;
+ 		bp->bio1.bi_io_vec = &bp->bv1;
+ 		bp->bio2.bi_io_vec = &bp->bv2;
  
- 	bp->bio1.bi_max_vecs = 1;
- 	bp->bio2.bi_max_vecs = 1;
+ 		bp->bio1.bi_max_vecs = 1;
+ 		bp->bio2.bi_max_vecs = 1;
+ 	}
  
  	bp->bio1.bi_end_io = bio_pair_end_1;
  	bp->bio2.bi_end_io = bio_pair_end_2;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the md tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Hi Neil,

On Tue, 10 Mar 2009 17:40:20 +1100 (EST) "NeilBrown" <neilb@suse.de> wrote:
>
> I've resolved this i my tree so you don't need to carry the fix any
> further.

Thanks again.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the md tree with the tree

[NeilBrown]

On Tue, March 10, 2009 4:33 pm, Stephen Rothwell wrote:
> Hi Neil,
>
> Today's linux-next merge of the md tree got a conflict in
> include/linux/dmaengine.h between commit
> 1d93e52eb48df986a3c4d5ad8a520bf1f6837367 ("dmaengine: update kerneldoc")
> from Linus' tree and commit a23742cb3c1ca5d412dea09de452c9d173b80afd
> ("async_tx: add support for asynchronous GF multiplication") from the md
> tree.
>
> I fixed it up (see below) and can carry the fix for a while.

Thanks.
I've resolved this i my tree so you don't need to carry the fix any
further.
I suspect Dan will give an updates set of async-raid6 patches some time
in the next few days....

NeilBrown

linux-next: manual merge of the md tree with the tree

[Stephen Rothwell]

Hi Neil,

Today's linux-next merge of the md tree got a conflict in
include/linux/dmaengine.h between commit
1d93e52eb48df986a3c4d5ad8a520bf1f6837367 ("dmaengine: update kerneldoc")
from Linus' tree and commit a23742cb3c1ca5d412dea09de452c9d173b80afd
("async_tx: add support for asynchronous GF multiplication") from the md
tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc include/linux/dmaengine.h
index 1956c8d,f9280b8..0000000
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -209,6 -240,9 +236,7 @@@ struct dma_async_tx_descriptor 
   * @global_node: list_head for global dma_device_list
   * @cap_mask: one or more dma_capability flags
   * @max_xor: maximum number of xor sources, 0 if no capability
+  * @max_pq: maximum number of PQ sources and PQ-continue capability
 - * @refcount: reference count
 - * @done: IO completion struct
   * @dev_id: unique device ID
   * @dev: struct device reference for dma mapping api
   * @device_alloc_chan_resources: allocate resources and return the