LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2010-04-29  2:58 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2010-04-29  2:58 UTC (permalink / raw)
  To: David Woodhouse
  Cc: linux-next, linux-kernel, "Jörn Engel",
	Ben Hutchings, Artem Bityutskiy

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/mtdcore.c between commit
a33eb6b91034c95b9b08576f68be170f995b2c7d ("Move mtd_bdi_*mappable to
mtdcore.c") from Linus' tree and commit
b520e412faaaad35641aeedd6059179f9f1b393c ("mtd: Replace static array of
devices with an idr structure") from the mtd tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/mtd/mtdcore.c
index b177e75,70a7858..0000000
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -19,39 -17,12 +19,40 @@@
  #include <linux/init.h>
  #include <linux/mtd/compatmac.h>
  #include <linux/proc_fs.h>
 +#include <linux/backing-dev.h>
+ #include <linux/idr.h>
  
  #include <linux/mtd/mtd.h>
 -#include "internal.h"
  
  #include "mtdcore.h"
 +/*
 + * backing device capabilities for non-mappable devices (such as NAND flash)
 + * - permits private mappings, copies are taken of the data
 + */
 +struct backing_dev_info mtd_bdi_unmappable = {
 +	.capabilities	= BDI_CAP_MAP_COPY,
 +};
 +
 +/*
 + * backing device capabilities for R/O mappable devices (such as ROM)
 + * - permits private mappings, copies are taken of the data
 + * - permits non-writable shared mappings
 + */
 +struct backing_dev_info mtd_bdi_ro_mappable = {
 +	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
 +			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP),
 +};
 +
 +/*
 + * backing device capabilities for writable mappable devices (such as RAM)
 + * - permits private mappings, copies are taken of the data
 + * - permits non-writable shared mappings
 + */
 +struct backing_dev_info mtd_bdi_rw_mappable = {
 +	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
 +			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP |
 +			   BDI_CAP_WRITE_MAP),
 +};
  
  static int mtd_cls_suspend(struct device *dev, pm_message_t state);
  static int mtd_cls_resume(struct device *dev);

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2021-08-17  4:49 Stephen Rothwell
  2021-08-17  8:15 ` Sean Young
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2021-08-17  4:49 UTC (permalink / raw)
  To: Richard Weinberger
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Miquel Raynal, Sean Young, Zhihao Cheng

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

Hi all,

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

  drivers/mtd/mtd_blkdevs.c

between commit:

  2b6d2833cd1d ("mtd: mtd_blkdevs: Initialize rq.limits.discard_granularity")

from Linus' tree and commit:

  c7c12c7ce6c1 ("mtd: blk_devs: make discard work on FTLs")

from the mtd tree.

I fixed it up (I (arbitrarily) used the former version) 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

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

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2019-01-29  0:17 Stephen Rothwell
  2019-01-29 14:12 ` Boris Brezillon
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2019-01-29  0:17 UTC (permalink / raw)
  To: Brian Norris
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Boris Brezillon, Miquel Raynal

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

Hi all,

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

  drivers/mtd/mtdpart.c

between commit:

  2b6f0090a333 ("mtd: Check add_mtd_device() ret code")

from Linus' tree and commit:

  2c24c9af0f38 ("mtd: rework partitions handling")

from the mtd 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/mtd/mtdpart.c
index 60104e1079c5,089095b3c50d..000000000000
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@@ -610,30 -265,18 +265,30 @@@ int mtd_add_partition(struct mtd_info *
  	part.size = length;
  	part.offset = offset;
  
- 	new = allocate_partition(parent, &part, -1, offset);
- 	if (IS_ERR(new))
- 		return PTR_ERR(new);
+ 	child = allocate_partition(parent, &part, -1, offset);
+ 	if (IS_ERR(child))
+ 		return PTR_ERR(child);
  
- 	mutex_lock(&mtd_partitions_mutex);
- 	list_add(&new->list, &mtd_partitions);
- 	mutex_unlock(&mtd_partitions_mutex);
+ 	mutex_lock(&master->props.master.partitions_lock);
+ 	list_add_tail(&child->props.part.node, &parent->partitions);
+ 	mutex_unlock(&master->props.master.partitions_lock);
  
- 	ret = add_mtd_device(&new->mtd);
 -	add_mtd_device(child);
++	ret = add_mtd_device(child);
 +	if (ret)
 +		goto err_remove_part;
  
- 	mtd_add_partition_attrs(new);
+ 	mtd_add_partition_attrs(child);
  
 +	return 0;
 +
 +err_remove_part:
- 	mutex_lock(&mtd_partitions_mutex);
- 	list_del(&new->list);
- 	mutex_unlock(&mtd_partitions_mutex);
++	mutex_lock(&master->props.master.partitions_lock);
++	list_del(&child->props.part.node);
++	mutex_unlock(&master->props.master.partitions_lock);
 +
- 	free_partition(new);
++	free_partition(child);
 +	pr_info("%s:%i\n", __func__, __LINE__);
 +
  	return ret;
  }
  EXPORT_SYMBOL_GPL(mtd_add_partition);
@@@ -722,46 -386,33 +398,47 @@@ int add_mtd_partitions(struct mtd_info 
  		       const struct mtd_partition *parts,
  		       int nbparts)
  {
- 	struct mtd_part *slave;
+ 	struct mtd_info *child, *master = mtd_get_master(parent);
  	uint64_t cur_offset = 0;
 -	int i;
 +	int i, ret;
  
- 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
+ 	printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n",
+ 	       nbparts, parent->name);
  
  	for (i = 0; i < nbparts; i++) {
- 		slave = allocate_partition(master, parts + i, i, cur_offset);
- 		if (IS_ERR(slave)) {
- 			ret = PTR_ERR(slave);
+ 		child = allocate_partition(parent, parts + i, i, cur_offset);
+ 		if (IS_ERR(child)) {
 -			del_mtd_partitions(parent);
 -			return PTR_ERR(child);
++			ret = PTR_ERR(child);
 +			goto err_del_partitions;
  		}
  
- 		mutex_lock(&mtd_partitions_mutex);
- 		list_add(&slave->list, &mtd_partitions);
- 		mutex_unlock(&mtd_partitions_mutex);
+ 		mutex_lock(&master->props.master.partitions_lock);
+ 		list_add_tail(&child->props.part.node, &parent->partitions);
+ 		mutex_unlock(&master->props.master.partitions_lock);
  
 -		add_mtd_device(child);
 +		ret = add_mtd_device(child);
 +		if (ret) {
- 			mutex_lock(&mtd_partitions_mutex);
- 			list_del(&slave->list);
- 			mutex_unlock(&mtd_partitions_mutex);
++			mutex_lock(&master->props.master.partitions_lock);
++			list_del(&child->props.part.node);
++			mutex_unlock(&master->props.master.partitions_lock);
 +
- 			free_partition(slave);
++			free_partition(child);
 +			goto err_del_partitions;
 +		}
 +
- 		mtd_add_partition_attrs(slave);
+ 		mtd_add_partition_attrs(child);
  		/* Look for subpartitions */
- 		parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
+ 		parse_mtd_partitions(child, parts[i].types, NULL);
  
- 		cur_offset = slave->offset + slave->mtd.size;
+ 		cur_offset = child->props.part.offset + child->size;
  	}
  
  	return 0;
 +
 +err_del_partitions:
- 	del_mtd_partitions(master);
++	del_mtd_partitions(parent);
 +
 +	return ret;
  }
  
  static DEFINE_SPINLOCK(part_parser_lock);

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

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2011-05-27  4:00 Stephen Rothwell
  2011-05-27  7:47 ` Artem Bityutskiy
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2011-05-27  4:00 UTC (permalink / raw)
  To: David Woodhouse
  Cc: linux-next, linux-kernel, Jamie Iles, Artem Bityutskiy,
	Marc Zyngier, Russell King

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/physmap.c between commit b7281ca2a4b0 ("ARM: 6904/1:
MTD: Add integrator-flash feature to physmap") from Linus' tree and
commit 984e6d8ec5ab ("mtd: physmap: convert to mtd_device_register()")
from the mtd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

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

diff --cc drivers/mtd/maps/physmap.c
index 1a9b94f,d205926..0000000
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@@ -92,10 -65,7 +81,8 @@@ static const char *rom_probe_types[] = 
  					"qinfo_probe",
  					"map_rom",
  					NULL };
- #ifdef CONFIG_MTD_PARTITIONS
 -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
 +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs",
 +					  NULL };
- #endif
  
  static int physmap_flash_probe(struct platform_device *dev)
  {

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2011-05-27  4:00 Stephen Rothwell
  2011-05-27  7:43 ` Artem Bityutskiy
  0 siblings, 1 reply; 13+ messages in thread
From: Stephen Rothwell @ 2011-05-27  4:00 UTC (permalink / raw)
  To: David Woodhouse
  Cc: linux-next, linux-kernel, Jamie Iles, Artem Bityutskiy,
	Marc Zyngier, Russell King

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

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/integrator-flash.c between commit adf0040096e4 ("ARM:
6906/1: MTD: Remove integrator-flash") from Linus' tree and commit
ee0e87b174bb ("mtd: convert remaining users to mtd_device_register()")
from the mtd tree.

The former removes the file updated by the latter, so I just removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2010-10-26  0:32 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2010-10-26  0:32 UTC (permalink / raw)
  To: David Woodhouse
  Cc: linux-next, linux-kernel, Arnd Bergmann, Maxim Levitsky,
	Artem Bityutskiy

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

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/mtd_blkdevs.c between commit
2a48fc0ab24241755dc93bfd4f01d68efab47f5a ("block: autoconvert trivial BKL
users to private mutex") from the  tree and commit
480792b7bf188c29b8d4b10fee65c3a06ec5dbf7 ("mtd: blktrans: kill BKL") from
the mtd tree.

I fixed it up (by removing all the bits of the former commit) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2010-08-07  3:37 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2010-08-07  3:37 UTC (permalink / raw)
  To: David Woodhouse
  Cc: linux-next, linux-kernel, Christian Dietrich, Christoph Egger,
	Josh Boyer

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

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/Kconfig and drivers/mtd/maps/redwood.c between commit
c76986cca8379db619de4b6c6b7359125df0e341 ("Remove REDWOOD_[456] config
options and conditional code") from Linus' tree and commit
73ee5760253dc8893502e19a9cb118d25dab21ec ("mtd: remove redwood map
driver") from the mtd tree.

The latter just went further by actually removing the driver so I used
that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 13+ messages in thread
* linux-next: manual merge of the mtd tree with Linus' tree
@ 2009-06-01  4:00 Stephen Rothwell
  0 siblings, 0 replies; 13+ messages in thread
From: Stephen Rothwell @ 2009-06-01  4:00 UTC (permalink / raw)
  To: David Woodhouse
  Cc: linux-next, linux-kernel, Vladimir Barinov, Lothar Wassmann,
	Artem Bityutskiy

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/mxc_nand.c between commit
8541c1180a355c4da283fc6b03a92c0233823c1b ("mtd: MXC NAND driver fixes
(v5)") from Linus' tree and commit
ccd93854d44710adaa02cecf0ef5f24ab383dd20 ("[MTD] Remove mtd->
{suspend,resume} calls from board drivers") from the mtd tree.

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

diff --cc drivers/mtd/nand/mxc_nand.c
index 40c2608,65040de..0000000
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@@ -1021,11 -1015,9 +1021,10 @@@ static int mxcnd_suspend(struct platfor
  	int ret = 0;
  
  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
 -
 -	/* Disable the NFC clock */
 -	clk_disable(nfc_clk);	/* FIXME */
 +	if (mtd) {
- 		ret = mtd->suspend(mtd);
 +		/* Disable the NFC clock */
 +		clk_disable(host->clk);
 +	}
  
  	return ret;
  }
@@@ -1038,12 -1028,8 +1037,11 @@@ static int mxcnd_resume(struct platform
  	int ret = 0;
  
  	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
 -	/* Enable the NFC clock */
 -	clk_enable(nfc_clk);	/* FIXME */
 +
 +	if (mtd) {
 +		/* Enable the NFC clock */
 +		clk_enable(host->clk);
- 		mtd->resume(mtd);
 +	}
  
  	return ret;
  }

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-08-17  8:41 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-29  2:58 linux-next: manual merge of the mtd tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2021-08-17  4:49 Stephen Rothwell
2021-08-17  8:15 ` Sean Young
2021-08-17  8:41   ` Miquel Raynal
2019-01-29  0:17 Stephen Rothwell
2019-01-29 14:12 ` Boris Brezillon
2011-05-27  4:00 Stephen Rothwell
2011-05-27  7:47 ` Artem Bityutskiy
2011-05-27  4:00 Stephen Rothwell
2011-05-27  7:43 ` Artem Bityutskiy
2010-10-26  0:32 Stephen Rothwell
2010-08-07  3:37 Stephen Rothwell
2009-06-01  4:00 Stephen Rothwell

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).