Re: Adrian Bunk is now taking over the 2.6.16-stable branch

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Chuck Ebbert]

In-Reply-To: <20060808195509.GR3691@stusta.de>

On Tue, 8 Aug 2006 21:55:10 +0200, Adrian Bunk wrote:

> > > > I believe I had 'fix pdflush after suspend' queued in Greg's tree. Is
> > > > it still queued or should I resend?
> > > 
> > > Is this "pdflush: handle resume wakeups"?
> > 
> > Yes. Do you have it somewhere or should I dig it up?
> 
> I've applied it.

Umm, is there some place we can check to see what you've applied?

I sent you "tty: serialize flush_to_ldisc" and I've got a few more
but I don't want to duplicate what you already have.

-- 
Chuck

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Adrian Bunk]

On Wed, Aug 09, 2006 at 05:45:53PM -0400, Chuck Ebbert wrote:
> In-Reply-To: <20060808195509.GR3691@stusta.de>
> 
> On Tue, 8 Aug 2006 21:55:10 +0200, Adrian Bunk wrote:
> 
> > > > > I believe I had 'fix pdflush after suspend' queued in Greg's tree. Is
> > > > > it still queued or should I resend?
> > > > 
> > > > Is this "pdflush: handle resume wakeups"?
> > > 
> > > Yes. Do you have it somewhere or should I dig it up?
> > 
> > I've applied it.
> 
> Umm, is there some place we can check to see what you've applied?

git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git

> I sent you "tty: serialize flush_to_ldisc" and I've got a few more
> but I don't want to duplicate what you already have.

Sorry that I hadn't answered your email.

That patch is in 2.6.17.8, and I will look at it since I'm currently 
going through all 2.6.17.7 and 2.6.17.8 patches looking for patches I 
should apply.

> Chuck

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Greg KH]

On Thu, Aug 10, 2006 at 12:00:49AM +0200, Adrian Bunk wrote:
> On Wed, Aug 09, 2006 at 05:45:53PM -0400, Chuck Ebbert wrote:
> > In-Reply-To: <20060808195509.GR3691@stusta.de>
> > 
> > On Tue, 8 Aug 2006 21:55:10 +0200, Adrian Bunk wrote:
> > 
> > > > > > I believe I had 'fix pdflush after suspend' queued in Greg's tree. Is
> > > > > > it still queued or should I resend?
> > > > > 
> > > > > Is this "pdflush: handle resume wakeups"?
> > > > 
> > > > Yes. Do you have it somewhere or should I dig it up?
> > > 
> > > I've applied it.
> > 
> > Umm, is there some place we can check to see what you've applied?
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git

No, I would not use the main git tree to queue patches up.  What happens
when you want to rip the middle one out because in review it turns out
that it is incorrect?

Please use a quilt tree of patches instead, and then only commit the
patches when you do a release.  It's much simpler that way.

thanks,

greg k-h

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Adrian Bunk]

On Wed, Aug 09, 2006 at 03:18:54PM -0700, Greg KH wrote:
> On Thu, Aug 10, 2006 at 12:00:49AM +0200, Adrian Bunk wrote:
> > On Wed, Aug 09, 2006 at 05:45:53PM -0400, Chuck Ebbert wrote:
> > > In-Reply-To: <20060808195509.GR3691@stusta.de>
> > > 
> > > On Tue, 8 Aug 2006 21:55:10 +0200, Adrian Bunk wrote:
> > > 
> > > > > > > I believe I had 'fix pdflush after suspend' queued in Greg's tree. Is
> > > > > > > it still queued or should I resend?
> > > > > > 
> > > > > > Is this "pdflush: handle resume wakeups"?
> > > > > 
> > > > > Yes. Do you have it somewhere or should I dig it up?
> > > > 
> > > > I've applied it.
> > > 
> > > Umm, is there some place we can check to see what you've applied?
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git
> 
> No, I would not use the main git tree to queue patches up.  What happens
> when you want to rip the middle one out because in review it turns out
> that it is incorrect?

  git-revert

> Please use a quilt tree of patches instead, and then only commit the
> patches when you do a release.  It's much simpler that way.

The way I'm doing it it's more the way the 2.4 and 2.6 trees work than 
how the -stable tree works.

I prefer it the way I'm doing it.

If it turns out I was wrong I can always switch to a quilt tree.

> thanks,
> 
> greg k-h

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Greg KH]

On Thu, Aug 10, 2006 at 12:45:29AM +0200, Adrian Bunk wrote:
> On Wed, Aug 09, 2006 at 03:18:54PM -0700, Greg KH wrote:
> > On Thu, Aug 10, 2006 at 12:00:49AM +0200, Adrian Bunk wrote:
> > > On Wed, Aug 09, 2006 at 05:45:53PM -0400, Chuck Ebbert wrote:
> > > > In-Reply-To: <20060808195509.GR3691@stusta.de>
> > > > 
> > > > On Tue, 8 Aug 2006 21:55:10 +0200, Adrian Bunk wrote:
> > > > 
> > > > > > > > I believe I had 'fix pdflush after suspend' queued in Greg's tree. Is
> > > > > > > > it still queued or should I resend?
> > > > > > > 
> > > > > > > Is this "pdflush: handle resume wakeups"?
> > > > > > 
> > > > > > Yes. Do you have it somewhere or should I dig it up?
> > > > > 
> > > > > I've applied it.
> > > > 
> > > > Umm, is there some place we can check to see what you've applied?
> > > 
> > > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git
> > 
> > No, I would not use the main git tree to queue patches up.  What happens
> > when you want to rip the middle one out because in review it turns out
> > that it is incorrect?
> 
>   git-revert

Ok, fair enough, but it messes with the changelogs a bunch.

> > Please use a quilt tree of patches instead, and then only commit the
> > patches when you do a release.  It's much simpler that way.
> 
> The way I'm doing it it's more the way the 2.4 and 2.6 trees work than 
> how the -stable tree works.
> 
> I prefer it the way I'm doing it.
> 
> If it turns out I was wrong I can always switch to a quilt tree.

Ok, it's your tree, you can mess with it as you like, just trying to
pass along a little advice from someone who has been there before... :)

good luck,

greg k-h

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Chris Wright]

* Greg KH (greg@kroah.com) wrote:
> On Thu, Aug 10, 2006 at 12:45:29AM +0200, Adrian Bunk wrote:
> > > No, I would not use the main git tree to queue patches up.  What happens
> > > when you want to rip the middle one out because in review it turns out
> > > that it is incorrect?
> > 
> >   git-revert
> 
> Ok, fair enough, but it messes with the changelogs a bunch.

You can always keep it all on a "pending" branch, and cherrypick if
needed (instead of straight merge if you needed to drop something) to
keep the final changelogs sane.

thanks,
-chris

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Rene Scharfe]

Greg KH schrieb:
> On Thu, Aug 10, 2006 at 12:00:49AM +0200, Adrian Bunk wrote:
>> On Wed, Aug 09, 2006 at 05:45:53PM -0400, Chuck Ebbert wrote:
>>> Umm, is there some place we can check to see what you've applied?
>> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.16.y.git
> 
> No, I would not use the main git tree to queue patches up.  What happens
> when you want to rip the middle one out because in review it turns out
> that it is incorrect?

You can have multiple branches in one git repository.  E.g. git's own
repository has a "master" branch containing all committed changes, a
"next" branch which is similar to a release candidate and is regularly
merged back into "master" if ready, and a "pu" branch which contains the
more experimental stuff.  The latter doesn't even have a continuous history.

And it has other branches containing different stuff, e.g. "man" is a
special branch containing the generated manpages.  You could also have
topic branches or one branch per submitter, or whatever.

> Please use a quilt tree of patches instead, and then only commit the
> patches when you do a release.  It's much simpler that way.

There's even a quilt clone based on git (http://www.procode.org/stgit/).
 I have never used it, though, so I can't comment on it.

That said, it's a good idea to keep the master branch continuous, i.e.
never delete it or reset it to some previous commit.  So, as you
suggest, have a staging area for patches and only commit the good ones
to your master branch.  You can use a branch in the same repo as staging
area, though.

You can do quite a lot of different things with just one git repository.
 :-D

René

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Stefan Richter]

Adrian Bunk wrote:
...
> I'm currently 
> going through all 2.6.17.7 and 2.6.17.8 patches looking for patches I 
> should apply.

Suggested updates for drivers/ieee1394/:

(from 2.6.17.2)
  Fix broken suspend/resume in ohci1394
should be applicable as-is. This does not add full suspend/resume
functionality to ohci1394 but it fixes fatal side effects on other
on-board hardware after resume.

(from 2.6.17.8)
  ieee1394: sbp2: enable auto spin-up for Maxtor disks
doesn't apply to 2.6.16 as-is.
https://bugzilla.novell.com/show_bug.cgi?id=183011#c6 has an adapted
version. I will mail it to you with proper description and signed-off-by
later today. While I am at it, I will resend that ohci1394 patch too.

I have a related question about your plans with Linux 2.6.16.yy.
Documentation/stable_kernel_rules.txt says:

 - It must fix a problem that causes a build error (but not for things
   marked CONFIG_BROKEN), an oops, a hang, data corruption, a real
   security issue, or some "oh, that's not good" issue.  In short,
   something critical.

I plan to submit a patch of the kind "fix recognition of a quirky
device" for 2.6.18. That patch does not fix an oops, hang, data
corruption, or security hole. (The patch will fulfill all other criteria
from stable_kernel_rules.) Do you consider "can't use that shiny device
under Linux" as "oh, that's not good" in the context of Linux 2.6.16.yy?

(I will not submit that patch for 2.6.17.y. I suppose I also wouldn't
submit it for 2.6.18.1 if it came too late for 2.8.18. One reason for me
to hesitate is because people who are able to patch their kernel can
already get fully up-to-date ieee1394 drivers from me for kernels as old
as 2.6.14.)
-- 
Stefan Richter
-=====-=-==- =--- -=-=-
http://arcgraph.de/sr/

[PATCH 2.6.16.27] Fix broken suspend/resume in ohci1394

[Stefan Richter]

Date: Mon, 22 May 2006 16:57:16 -0600
From: Robert Hancock <hancockr@shaw.ca>
Subject: Fix broken suspend/resume in ohci1394 (Was: ACPI suspend problems revisited)

I've been experimenting to track down the cause of suspend/resume problems
on my Compaq Presario X1050 laptop:

http://bugzilla.kernel.org/show_bug.cgi?id=6075

Essentially the ACPI Embedded Controller and keyboard controller would
get into a bizarre, confused state after resume.

I found that unloading the ohci1394 module before suspend and reloading it
after resume made the problem go away.  Diffing the dmesg output from
resume, with and without the module loaded, I found that with the module
loaded I was missing these:

PM: Writing back config space on device 0000:02:00.0 at offset 1. (Was 2100080, writing 2100007)
PM: Writing back config space on device 0000:02:00.0 at offset 3. (Was 0, writing 8008)
PM: Writing back config space on device 0000:02:00.0 at offset 4. (Was 0, writing 90200000)
PM: Writing back config space on device 0000:02:00.0 at offset 5. (Was 1, writing 2401)
PM: Writing back config space on device 0000:02:00.0 at offset f. (Was 20000100, writing 2000010a)

The default PCI driver performs the pci_restore_state when no driver is
loaded for the device.  When the ohci1394 driver is loaded, it is supposed
to do this, however it appears not to do so.

I created the patch below and tested it, and it appears to resolve the
suspend problems I was having with the module loaded.  I only added in the
pci_save_state and pci_restore_state - however, though I know little of
this hardware, surely the driver should really be doing more than this when
suspending and resuming?  Currently it does almost nothing, what if there
are commands in progress, etc?

Signed-off-by: Robert Hancock <hancockr@shaw.ca>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
This patch also appeared in 2.6.17.2 and 2.6.18.  There is still some
functionality missing for full resume capability in ohci1394.

Index: linux-2.6.16.27/drivers/ieee1394/ohci1394.c
===================================================================
--- linux-2.6.16.27.orig/drivers/ieee1394/ohci1394.c	2006-08-10 18:10:13.000000000 +0200
+++ linux-2.6.16.27/drivers/ieee1394/ohci1394.c	2006-08-10 18:11:45.000000000 +0200
@@ -3536,6 +3536,7 @@ static int ohci1394_pci_resume (struct p
 	}
 #endif /* CONFIG_PPC_PMAC */
 
+	pci_restore_state(pdev);
 	pci_enable_device(pdev);
 
 	return 0;
@@ -3555,6 +3556,8 @@ static int ohci1394_pci_suspend (struct 
 	}
 #endif
 
+	pci_save_state(pdev);
+
 	return 0;
 }
 

[PATCH 2.6.16.27] ieee1394: sbp2: enable auto spin-up for Maxtor disks

[Stefan Richter]

At least Maxtor OneTouch III require a "start stop unit" command after
auto spin-down before the next access can proceed.  This patch activates
the responsible code in scsi_mod for all Maxtor SBP-2 disks.
https://bugzilla.novell.com/show_bug.cgi?id=183011

Maybe that should be done for all SBP-2 disks, but better be cautious.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
This patch also appeared in 2.6.17.8 and 2.6.18.

Index: linux-2.6.16.27/drivers/ieee1394/sbp2.c
===================================================================
--- linux-2.6.16.27.orig/drivers/ieee1394/sbp2.c	2006-08-10 18:10:13.000000000 +0200
+++ linux-2.6.16.27/drivers/ieee1394/sbp2.c	2006-08-10 18:18:54.000000000 +0200
@@ -2505,6 +2505,9 @@ static int sbp2scsi_slave_configure(stru
 		SBP2_INFO("enabling iPod workaround: decrement disk capacity");
 		sdev->fix_capacity = 1;
 	}
+	if (scsi_id->ne->guid_vendor_id == 0x0010b9 && /* Maxtor's OUI */
+	    (sdev->type == TYPE_DISK || sdev->type == TYPE_RBC))
+		sdev->allow_restart = 1;
 	return 0;
 }
 

Re: Adrian Bunk is now taking over the 2.6.16-stable branch

[Adrian Bunk]

On Thu, Aug 10, 2006 at 01:57:13PM +0200, Stefan Richter wrote:
> Adrian Bunk wrote:
> ...
> > I'm currently 
> > going through all 2.6.17.7 and 2.6.17.8 patches looking for patches I 
> > should apply.
> 
> Suggested updates for drivers/ieee1394/:
> 
> (from 2.6.17.2)
>   Fix broken suspend/resume in ohci1394
> should be applicable as-is. This does not add full suspend/resume
> functionality to ohci1394 but it fixes fatal side effects on other
> on-board hardware after resume.
> 
> (from 2.6.17.8)
>   ieee1394: sbp2: enable auto spin-up for Maxtor disks
> doesn't apply to 2.6.16 as-is.
> https://bugzilla.novell.com/show_bug.cgi?id=183011#c6 has an adapted
> version. I will mail it to you with proper description and signed-off-by
> later today. While I am at it, I will resend that ohci1394 patch too.

Thanks, I've applied them both.

> I have a related question about your plans with Linux 2.6.16.yy.
> Documentation/stable_kernel_rules.txt says:
> 
>  - It must fix a problem that causes a build error (but not for things
>    marked CONFIG_BROKEN), an oops, a hang, data corruption, a real
>    security issue, or some "oh, that's not good" issue.  In short,
>    something critical.
> 
> I plan to submit a patch of the kind "fix recognition of a quirky
> device" for 2.6.18. That patch does not fix an oops, hang, data
> corruption, or security hole. (The patch will fulfill all other criteria
> from stable_kernel_rules.) Do you consider "can't use that shiny device
> under Linux" as "oh, that's not good" in the context of Linux 2.6.16.yy?
>...

If the device doesn't work, it's an "oh, that's not good" issue. ;-)

More seriously:

I consider stable_kernel_rules.txt as a more formal description of
"avoid regressions".

If the patch is tested, unlikely to break anything and included in 
Linus' tree it's a candidate for 2.6.16.

> Stefan Richter

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed