All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the device-mapper tree with Linus' tree
@ 2022-03-29 22:53 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2022-03-29 22:53 UTC (permalink / raw)
  To: Alasdair G Kergon, Mike Snitzer
  Cc: Christoph Hellwig, Linux Kernel Mailing List,
	Linux Next Mailing List, Martin K. Petersen

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

Hi all,

Today's linux-next merge of the device-mapper tree got a conflict in:

  drivers/md/dm.c

between commit:

  a773187e37fa ("scsi: dm: Remove WRITE_SAME support")

from Linus' tree and commit:

  259a97ec4818 ("dm: optimize is_abnormal_io for normal rw IO")

from the device-mapper 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/md/dm.c
index ad2e0bbeb559,853185992c5c..000000000000
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@@ -1413,17 -1504,21 +1493,20 @@@ static void __send_changing_extent_only
  
  static bool is_abnormal_io(struct bio *bio)
  {
- 	bool r = false;
+ 	unsigned int op = bio_op(bio);
  
- 	switch (bio_op(bio)) {
- 	case REQ_OP_DISCARD:
- 	case REQ_OP_SECURE_ERASE:
- 	case REQ_OP_WRITE_ZEROES:
- 		r = true;
- 		break;
+ 	if (op != REQ_OP_READ && op != REQ_OP_WRITE && op != REQ_OP_FLUSH) {
+ 		switch (op) {
+ 		case REQ_OP_DISCARD:
+ 		case REQ_OP_SECURE_ERASE:
 -		case REQ_OP_WRITE_SAME:
+ 		case REQ_OP_WRITE_ZEROES:
+ 			return true;
+ 		default:
+ 			break;
+ 		}
  	}
  
- 	return r;
+ 	return false;
  }
  
  static bool __process_abnormal_io(struct clone_info *ci, struct dm_target *ti,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the device-mapper tree with Linus' tree
  2020-12-21 22:50 Stephen Rothwell
@ 2020-12-22 13:15 ` Christoph Hellwig
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2020-12-22 13:15 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alasdair G Kergon, Mike Snitzer, Christoph Hellwig,
	Hannes Reinecke, Jens Axboe, Linux Kernel Mailing List,
	Linux Next Mailing List

Mike, Hannes,

I think this patch is rather harmful.  Why does device mapper even
mix file system path with a dev_t and all the other weird forms
parsed by name_to_dev_t, which was supposed to be be for the early
init code where no file system is available.

Can we please kick off a proper discussion for this on the linux-block
list?

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the device-mapper tree with Linus' tree
@ 2020-12-21 22:50 Stephen Rothwell
  2020-12-22 13:15 ` Christoph Hellwig
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2020-12-21 22:50 UTC (permalink / raw)
  To: Alasdair G Kergon, Mike Snitzer
  Cc: Christoph Hellwig, Hannes Reinecke, Jens Axboe,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

Today's linux-next merge of the device-mapper tree got a conflict in:

  drivers/md/dm-table.c

between commit:

  4e7b5671c6a8 ("block: remove i_bdev")

from Linus' tree and commit:

  05a876e9a2a8 ("dm table: avoid filesystem lookup in dm_get_dev_t()")

from the device-mapper 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/md/dm-table.c
index 188f41287f18,299a256fb409..000000000000
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@@ -347,9 -347,22 +347,15 @@@ static int upgrade_mode(struct dm_dev_i
  dev_t dm_get_dev_t(const char *path)
  {
  	dev_t dev;
 -	struct block_device *bdev;
+ 	unsigned int maj, min;
  
+ 	if (sscanf(path, "%u:%u", &maj, &min) == 2) {
+ 		dev = MKDEV(maj, min);
+ 		if (maj == MAJOR(dev) && min == MINOR(dev))
+ 			return dev;
+ 	}
 -	bdev = lookup_bdev(path);
 -	if (IS_ERR(bdev))
 +	if (lookup_bdev(path, &dev))
  		dev = name_to_dev_t(path);
 -	else {
 -		dev = bdev->bd_dev;
 -		bdput(bdev);
 -	}
 -
  	return dev;
  }
  EXPORT_SYMBOL_GPL(dm_get_dev_t);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the device-mapper tree with Linus' tree
@ 2013-03-04  0:36 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2013-03-04  0:36 UTC (permalink / raw)
  To: Alasdair G Kergon
  Cc: linux-next, linux-kernel, Joe Thornber, Heinz Mauelshagen, Mike Snitzer

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

Hi Alasdair,

Today's linux-next merge of the device-mapper tree got a conflict in
drivers/md/dm-cache-target.c between commit c6b4fcbad044 ("m: add cache
target") from Linus' tree and commit 2db8e6e2cd1c ("Add a target that
allows a fast device such as an SSD to be used as a") from the
device-mapper tree.

These are basically the same patch.  I used the version from Linus' tree
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 --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the device-mapper tree with Linus' tree
  2009-10-05  3:41 Stephen Rothwell
@ 2009-10-05 15:40 ` Jiri Slaby
  0 siblings, 0 replies; 6+ messages in thread
From: Jiri Slaby @ 2009-10-05 15:40 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alasdair G Kergon, linux-next, linux-kernel, Philipp Reisner

On 10/05/2009 05:41 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the device-mapper tree got a conflict in
> drivers/md/dm-log-userspace-transfer.c between commit
> 18366b05a00349c1606269ba7422bf9b3a357ff2 ("connector/dm: Fixed a
> compilation warning") from Linus' tree and commit
> 584ac98acfc033dfda338641e736b0100fd31909
> ("dm-log-fix-cn_ulog_callback-declaration") from the device-mapper tree.
> 
> The former commit (already in Linus' tree) supersedes the latter, so I
> used the former.

Hmm, great! I sent it month and a half earlier with proper changelog and
meaningful subject. akpm sent it twice with davem in Cc. davem merged
that one instead.

/me demotivated to post such fixes again.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the device-mapper tree with Linus' tree
@ 2009-10-05  3:41 Stephen Rothwell
  2009-10-05 15:40 ` Jiri Slaby
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-10-05  3:41 UTC (permalink / raw)
  To: Alasdair G Kergon; +Cc: linux-next, linux-kernel, Philipp Reisner, Jiri Slaby

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

Hi Alasdair,

Today's linux-next merge of the device-mapper tree got a conflict in
drivers/md/dm-log-userspace-transfer.c between commit
18366b05a00349c1606269ba7422bf9b3a357ff2 ("connector/dm: Fixed a
compilation warning") from Linus' tree and commit
584ac98acfc033dfda338641e736b0100fd31909
("dm-log-fix-cn_ulog_callback-declaration") from the device-mapper tree.

The former commit (already in Linus' tree) supersedes the latter, so I
used the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-29 22:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-29 22:53 linux-next: manual merge of the device-mapper tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-12-21 22:50 Stephen Rothwell
2020-12-22 13:15 ` Christoph Hellwig
2013-03-04  0:36 Stephen Rothwell
2009-10-05  3:41 Stephen Rothwell
2009-10-05 15:40 ` Jiri Slaby

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.