aboutsummaryrefslogtreecommitdiffstats
diff options
Diffstat
-rw-r--r--driver-core/bus_id-block.patch4
-rw-r--r--driver-core/bus_id-i2o.patch2
-rw-r--r--driver-core/bus_id-mtd.patch33
-rw-r--r--usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch2
-rw-r--r--version2
5 files changed, 21 insertions, 22 deletions
diff --git a/driver-core/bus_id-block.patch b/driver-core/bus_id-block.patch
index 9130dce0372b50..6136372a9c3516 100644
--- a/driver-core/bus_id-block.patch
+++ b/driver-core/bus_id-block.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int max_queue;
unsigned long flags;
};
-@@ -779,7 +779,7 @@ static struct bsg_device *bsg_add_device
+@@ -781,7 +781,7 @@ static struct bsg_device *bsg_add_device
mutex_lock(&bsg_mutex);
hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
@@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
dprintk("bound to <%s>, max queue %d\n",
format_dev_t(buf, inode->i_rdev), bd->max_queue);
-@@ -990,7 +990,7 @@ int bsg_register_queue(struct request_qu
+@@ -992,7 +992,7 @@ int bsg_register_queue(struct request_qu
if (name)
devname = name;
else
diff --git a/driver-core/bus_id-i2o.patch b/driver-core/bus_id-i2o.patch
index 428562bb79f5ec..06133889ad4d27 100644
--- a/driver-core/bus_id-i2o.patch
+++ b/driver-core/bus_id-i2o.patch
@@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
-@@ -1073,7 +1073,7 @@ struct i2o_controller *i2o_iop_alloc(voi
+@@ -1072,7 +1072,7 @@ struct i2o_controller *i2o_iop_alloc(voi
c->device.release = &i2o_iop_release;
diff --git a/driver-core/bus_id-mtd.patch b/driver-core/bus_id-mtd.patch
index fe2645e9624fe9..18962208e15f25 100644
--- a/driver-core/bus_id-mtd.patch
+++ b/driver-core/bus_id-mtd.patch
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -170,7 +170,7 @@ static int wait_till_ready(struct m25p *
- static int erase_block(struct m25p *flash)
+ static int erase_chip(struct m25p *flash)
{
DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n",
- flash->spi->dev.bus_id, __func__,
@@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
flash->mtd.size / 1024);
/* Wait until finished previous write command. */
-@@ -197,7 +197,7 @@ static int erase_block(struct m25p *flas
+@@ -197,7 +197,7 @@ static int erase_chip(struct m25p *flash
static int erase_sector(struct m25p *flash, u32 offset)
{
DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB at 0x%08x\n",
@@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(u32)instr->addr, instr->len);
/* sanity checks */
-@@ -292,7 +292,7 @@ static int m25p80_read(struct mtd_info *
+@@ -295,7 +295,7 @@ static int m25p80_read(struct mtd_info *
struct spi_message m;
DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(u32)from, len);
/* sanity checks */
-@@ -364,7 +364,7 @@ static int m25p80_write(struct mtd_info
+@@ -367,7 +367,7 @@ static int m25p80_write(struct mtd_info
struct spi_message m;
DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
@@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(u32)to, len);
if (retlen)
-@@ -560,7 +560,7 @@ static struct flash_info *__devinit jede
+@@ -563,7 +563,7 @@ static struct flash_info *__devinit jede
tmp = spi_write_then_read(spi, &code, 1, id, 5);
if (tmp < 0) {
DEBUG(MTD_DEBUG_LEVEL0, "%s: error %d reading JEDEC ID\n",
@@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return NULL;
}
jedec = id[0];
-@@ -613,7 +613,7 @@ static int __devinit m25p_probe(struct s
+@@ -617,7 +617,7 @@ static int __devinit m25p_probe(struct s
/* unrecognized chip? */
if (i == ARRAY_SIZE(m25p_data)) {
DEBUG(MTD_DEBUG_LEVEL0, "%s: unrecognized id %s\n",
@@ -89,7 +89,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
info = NULL;
/* recognized; is that chip really what's there? */
-@@ -654,7 +654,7 @@ static int __devinit m25p_probe(struct s
+@@ -658,7 +658,7 @@ static int __devinit m25p_probe(struct s
if (data && data->name)
flash->mtd.name = data->name;
else
@@ -287,13 +287,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
info->map.bankwidth = pdata->width;
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
-@@ -116,14 +116,14 @@ static int physmap_flash_probe(struct pl
-
- info->res = request_mem_region(dev->resource[i].start,
- dev->resource[i].end - dev->resource[i].start + 1,
-- dev->dev.bus_id);
-+ dev_name(&dev->dev));
- if (info->res == NULL) {
+@@ -108,13 +108,13 @@ static int physmap_flash_probe(struct pl
+ if (!devm_request_mem_region(&dev->dev,
+ dev->resource[i].start,
+ dev->resource[i].end - dev->resource[i].start + 1,
+- dev->dev.bus_id)) {
++ dev_name(&dev->dev)) {
dev_err(&dev->dev, "Could not reserve memory region\n");
err = -ENOMEM;
goto err_out;
@@ -304,7 +303,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
info->map[i].phys = dev->resource[i].start;
info->map[i].size = dev->resource[i].end - dev->resource[i].start + 1;
info->map[i].bankwidth = physmap_data->width;
-@@ -158,7 +158,7 @@ static int physmap_flash_probe(struct pl
+@@ -150,7 +150,7 @@ static int physmap_flash_probe(struct pl
* We detected multiple devices. Concatenate them together.
*/
#ifdef CONFIG_MTD_CONCAT
@@ -346,7 +345,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
size_t size;
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
-@@ -220,7 +220,7 @@ static int __devinit fun_probe(struct of
+@@ -222,7 +222,7 @@ static int __devinit fun_probe(struct of
fun->rnb_gpio = of_get_gpio(ofdev->node, 0);
if (fun->rnb_gpio >= 0) {
@@ -390,7 +389,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
-@@ -669,7 +669,7 @@ static int __devinit omap2_onenand_probe
+@@ -668,7 +668,7 @@ static int __devinit omap2_onenand_probe
c->onenand.base);
c->pdev = pdev;
diff --git a/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch b/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch
index f7f6342bd4887a..b8249f632fca0c 100644
--- a/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch
+++ b/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2978,6 +2978,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CON
+@@ -2979,6 +2979,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CON
P: Felipe Balbi
M: felipe.balbi@nokia.com
L: linux-usb@vger.kernel.org
diff --git a/version b/version
index f9fc5c65fc0c24..a1f0174a387ae6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.28-rc7
+2.6.28-rc7-git8
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 17:58:13 +0000