linux-next: manual merge of pcmcia tree

linux-next: manual merge of pcmcia tree

[Stephen Rothwell]

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

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/ide/legacy/ide-cs.c between commit
a17bf220231a5061a29a27a99a273246eb3b156e ("pcmcia: add another pata/ide
ID") from Linus' tree and commit f3aa02c57dec52fbe519c51f741e3a94d19dcb4c
("pcmcia: add another pata/ide ID") from the pcmcia tree.

>From the discussion on LKML, I assume the upstream version is correct and
took that.

-- 
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 pcmcia tree

[Dominik Brodowski]

Hi Stephen,

On Mon, Jun 23, 2008 at 05:32:41PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the pcmcia tree got a conflict in
> drivers/ide/legacy/ide-cs.c between commit
> a17bf220231a5061a29a27a99a273246eb3b156e ("pcmcia: add another pata/ide
> ID") from Linus' tree and commit f3aa02c57dec52fbe519c51f741e3a94d19dcb4c
> ("pcmcia: add another pata/ide ID") from the pcmcia tree.
> 
> From the discussion on LKML, I assume the upstream version is correct and
> took that.

Thanks! The two patches which were now (fixed and) sent upstream are now
removed from the pcmcia tree.

Best,
	Dominik

Re: linux-next: manual merge of pcmcia tree

[Stephen Rothwell]

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

On Fri, 20 Jun 2008 13:53:27 -0600 Jonathan Corbet <corbet@lwn.net> wrote:
>
> On Fri, 20 Jun 2008 19:43:21 +0200
> Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> 
> > Well, when do you intend to push that patch? I hope Linus will apply
> > the pcmcia tree soon after 2.6.26 is released.
> 
> Similar for bkl-removal - it's targeted at 2.6.27.
> 
> > > Here's the patch; if you take it let me know and I'll remove it from
> > > the bkl-removal tree.
> > 
> > I've applied it to pcmcia-2.6.git and just pushed that to kernel.org.
> 
> OK, I'll pull it from bkl-removal.

Thanks, guys - one conflict down (hopefully) :-)

-- 
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 pcmcia tree

[Jonathan Corbet]

On Fri, 20 Jun 2008 19:43:21 +0200
Dominik Brodowski <linux@dominikbrodowski.net> wrote:

> Well, when do you intend to push that patch? I hope Linus will apply
> the pcmcia tree soon after 2.6.26 is released.

Similar for bkl-removal - it's targeted at 2.6.27.

> > Here's the patch; if you take it let me know and I'll remove it from
> > the bkl-removal tree.
> 
> I've applied it to pcmcia-2.6.git and just pushed that to kernel.org.

OK, I'll pull it from bkl-removal.

Thanks,

jon

Re: linux-next: manual merge of pcmcia tree

[Dominik Brodowski]

Hi,

On Thu, Jun 19, 2008 at 02:34:41PM -0600, Jonathan Corbet wrote:
> [Finally beginning to catch up with life...]

... somehow I know too well how that is ;)

> On Mon, 16 Jun 2008 10:12:58 +0200
> Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> 
> > @Alan,@Jonathan: since this is the same patch, just a different title
> > -- shall it be removed from one of our trees?
> 
> If you want to have it
> in your tree, that's fine with me; the only dependency is that it needs
> to be applied *before* the removal of BKL protection to cdev open()
> functions or there will be a range of commits over which things are
> potentially unsafe - not that I think it would burn even a single
> tester.

Well, when do you intend to push that patch? I hope Linus will apply the
pcmcia tree soon after 2.6.26 is released.

> Here's the patch; if you take it let me know and I'll remove it from
> the bkl-removal tree.

I've applied it to pcmcia-2.6.git and just pushed that to kernel.org.

Thanks,
	Dominik

Re: linux-next: manual merge of pcmcia tree

[Jonathan Corbet]

[Finally beginning to catch up with life...]

On Mon, 16 Jun 2008 10:12:58 +0200
Dominik Brodowski <linux@dominikbrodowski.net> wrote:

> @Alan,@Jonathan: since this is the same patch, just a different title
> -- shall it be removed from one of our trees?

If you want to have it
in your tree, that's fine with me; the only dependency is that it needs
to be applied *before* the removal of BKL protection to cdev open()
functions or there will be a range of commits over which things are
potentially unsafe - not that I think it would burn even a single
tester.

Here's the patch; if you take it let me know and I'll remove it from
the bkl-removal tree.

Thanks,

jon

--
cm40x0: cdev lock_kernel() pushdown

Signed-off-by: Jonathan Corbet <corbet@lwn.net>

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 4a933d4..350f596 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -32,6 +32,7 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/bitrev.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -1631,16 +1632,22 @@ static int cmm_open(struct inode *inode, struct file *filp)
 	struct cm4000_dev *dev;
 	struct pcmcia_device *link;
 	int minor = iminor(inode);
+	int ret;
 
 	if (minor >= CM4000_MAX_DEV)
 		return -ENODEV;
 
+	lock_kernel();
 	link = dev_table[minor];
-	if (link == NULL || !pcmcia_dev_present(link))
-		return -ENODEV;
+	if (link == NULL || !pcmcia_dev_present(link)) {
+		ret = -ENODEV;
+		goto out;
+	}
 
-	if (link->open)
-		return -EBUSY;
+	if (link->open) {
+		ret = -EBUSY;
+		goto out;
+	}
 
 	dev = link->priv;
 	filp->private_data = dev;
@@ -1660,8 +1667,10 @@ static int cmm_open(struct inode *inode, struct file *filp)
 	 * vaild = block until valid (or card
 	 * inserted)
 	 */
-	if (filp->f_flags & O_NONBLOCK)
-		return -EAGAIN;
+	if (filp->f_flags & O_NONBLOCK) {
+		ret = -EAGAIN;
+		goto out;
+	}
 
 	dev->mdelay = T_50MSEC;
 
@@ -1671,7 +1680,10 @@ static int cmm_open(struct inode *inode, struct file *filp)
 	link->open = 1;		/* only one open per device */
 
 	DEBUGP(2, dev, "<- cmm_open\n");
-	return nonseekable_open(inode, filp);
+	ret = nonseekable_open(inode, filp);
+out:
+	unlock_kernel();
+	return ret;
 }
 
 static int cmm_close(struct inode *inode, struct file *filp)
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 035084c..6181f8a 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -26,6 +26,7 @@
 #include <linux/fs.h>
 #include <linux/delay.h>
 #include <linux/poll.h>
+#include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -448,23 +449,30 @@ static int cm4040_open(struct inode *inode, struct file *filp)
 	struct reader_dev *dev;
 	struct pcmcia_device *link;
 	int minor = iminor(inode);
+	int ret;
 
 	if (minor >= CM_MAX_DEV)
 		return -ENODEV;
 
+	lock_kernel();
 	link = dev_table[minor];
-	if (link == NULL || !pcmcia_dev_present(link))
-		return -ENODEV;
+	if (link == NULL || !pcmcia_dev_present(link)) {
+		ret = -ENODEV;
+		goto out;
+	}
 
-	if (link->open)
-		return -EBUSY;
+	if (link->open) {
+		ret = -EBUSY;
+		goto out;
+	}
 
 	dev = link->priv;
 	filp->private_data = dev;
 
 	if (filp->f_flags & O_NONBLOCK) {
 		DEBUGP(4, dev, "filep->f_flags O_NONBLOCK set\n");
-		return -EAGAIN;
+		ret = -EAGAIN;
+		goto out;
 	}
 
 	link->open = 1;
@@ -473,7 +481,10 @@ static int cm4040_open(struct inode *inode, struct file *filp)
 	mod_timer(&dev->poll_timer, jiffies + POLL_PERIOD);
 
 	DEBUGP(2, dev, "<- cm4040_open (successfully)\n");
-	return nonseekable_open(inode, filp);
+	ret = nonseekable_open(inode, filp);
+out:
+	unlock_kernel();
+	return ret;
 }
 
 static int cm4040_close(struct inode *inode, struct file *filp)
-- 
1.5.4.5

Re: linux-next: manual merge of pcmcia tree

[Stephen Rothwell]

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

On Mon, 16 Jun 2008 19:04:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 16 Jun 2008 10:57:54 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> >
> > Uh, right. Sorry. If the other patch shall be included in the pcmcia tree
> > instead of the blk-tree, just send it to me.
> 
> Thats up to Jon, I think.

But, for what its worth, I think it should be there.

-- 
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 pcmcia tree

[Stephen Rothwell]

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

Hi Dominik,

On Mon, 16 Jun 2008 10:57:54 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
>
> Uh, right. Sorry. If the other patch shall be included in the pcmcia tree
> instead of the blk-tree, just send it to me.

Thats up to Jon, I think.

-- 
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 pcmcia tree

[Dominik Brodowski]

Hi Stephen,

On Mon, Jun 16, 2008 at 06:49:43PM +1000, Stephen Rothwell wrote:
> On Mon, 16 Jun 2008 10:12:58 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
> >
> > On Mon, Jun 16, 2008 at 05:51:26PM +1000, Stephen Rothwell wrote:
> > > Today's linux-next merge of the pcmcia tree got a conflict in
> > > drivers/char/pcmcia/cm4000_cs.c between commit
> > > d30f1f9e1f5391a649a4e2ad442c0b76f4e44c32 ("cm40x0: cdev lock_kernel()
> > > pushdown") from the bkl-removal tree and commit
> > > 5316046340ca74e0d327a88aa719fa0b2481a7ff ("pcmcia: switch cm4000_cs.c to
> > > unlocked_ioctl") from the pcmcia tree.
> > > 
> > > It was just overlapping replacement of includes, so I did the obvious
> > > fixup.
> > 
> > @Stephen: many thanks!
> > 
> > @Alan,@Jonathan: since this is the same patch, just a different title --
> > shall it be removed from one of our trees?
> 
> Those patches are not identical ... the first does _open, the second does
> _ioctl.  The only overlap in the includes at the top.

Uh, right. Sorry. If the other patch shall be included in the pcmcia tree
instead of the blk-tree, just send it to me.

Best,
	Dominik

Re: linux-next: manual merge of pcmcia tree

[Stephen Rothwell]

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

Hi Dominik,

On Mon, 16 Jun 2008 10:12:58 +0200 Dominik Brodowski <linux@dominikbrodowski.net> wrote:
>
> On Mon, Jun 16, 2008 at 05:51:26PM +1000, Stephen Rothwell wrote:
> > Today's linux-next merge of the pcmcia tree got a conflict in
> > drivers/char/pcmcia/cm4000_cs.c between commit
> > d30f1f9e1f5391a649a4e2ad442c0b76f4e44c32 ("cm40x0: cdev lock_kernel()
> > pushdown") from the bkl-removal tree and commit
> > 5316046340ca74e0d327a88aa719fa0b2481a7ff ("pcmcia: switch cm4000_cs.c to
> > unlocked_ioctl") from the pcmcia tree.
> > 
> > It was just overlapping replacement of includes, so I did the obvious
> > fixup.
> 
> @Stephen: many thanks!
> 
> @Alan,@Jonathan: since this is the same patch, just a different title --
> shall it be removed from one of our trees?

Those patches are not identical ... the first does _open, the second does
_ioctl.  The only overlap in the includes at the top.

-- 
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 pcmcia tree

[Dominik Brodowski]

Hi,

On Mon, Jun 16, 2008 at 05:51:26PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the pcmcia tree got a conflict in
> drivers/char/pcmcia/cm4000_cs.c between commit
> d30f1f9e1f5391a649a4e2ad442c0b76f4e44c32 ("cm40x0: cdev lock_kernel()
> pushdown") from the bkl-removal tree and commit
> 5316046340ca74e0d327a88aa719fa0b2481a7ff ("pcmcia: switch cm4000_cs.c to
> unlocked_ioctl") from the pcmcia tree.
> 
> It was just overlapping replacement of includes, so I did the obvious
> fixup.

@Stephen: many thanks!

@Alan,@Jonathan: since this is the same patch, just a different title --
shall it be removed from one of our trees?

Thanks,
	Dominik

linux-next: manual merge of pcmcia tree

[Stephen Rothwell]

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

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/char/pcmcia/cm4000_cs.c between commit
d30f1f9e1f5391a649a4e2ad442c0b76f4e44c32 ("cm40x0: cdev lock_kernel()
pushdown") from the bkl-removal tree and commit
5316046340ca74e0d327a88aa719fa0b2481a7ff ("pcmcia: switch cm4000_cs.c to
unlocked_ioctl") from the pcmcia tree.

It was just overlapping replacement of includes, so I did the obvious
fixup.

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

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