Skip to contentSkip to conversation

staging tree closed for 3.7

DISCUSSION Greg Kroah-Hartman 3 participants 8 messages Sep 26, 2012 – Sep 27, 2012

lore
Share & tools
lore
#0 lore raw

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Ian and Hartley, I've not applied a few of the last patches you sent me as it seems there was some disagreements.

Also, the recent __user cleanups for the comedi drivers seemed to be way too big. I'll take a look at them in the next few weeks, surely we can do this in a simpler manner without needing to get every driver involved, but I could be wrong. I'll let you all know.

The diffstat for the 3.7 merge is pretty big:

 660 files changed, 50816 insertions(+), 24515 deletions(-)

with 1086 individual patches, which is quite a lot.

thanks,

greg k-h

#1 lore raw
Quoted 4 lines · Greg Kroah-Hartman

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Oh, and if I've missed any patches that people have sent me already, please let me know, because I don't have them anymore.

thanks,

greg k-h

#2 lore raw
Quoted 8 lines · Greg Kroah-Hartman
Quoted 4 lines · Greg Kroah-Hartman

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Oh, and if I've missed any patches that people have sent me already, please let me know, because I don't have them anymore.

Greg,

What about my "staging: comedi: drivers: use comedi_fc.h cmdtest helpers"?

It's quite large but does have decent diffstat:

46 files changed, 766 insertions(+), 1997 deletions(-)

If it doesn't apply due to conflicts, or you would rather just wait until 3.7-rc1, it's not a problem.

I have updated the patch to fix the typo Ian pointed out and to remove the Reported-by signoff from Dan if you would like me to repost it.

Regards,
Hartley

#3 lore raw
Quoted 10 lines · H Hartley Sweeten
Quoted 8 lines · Greg Kroah-Hartman
Quoted 4 lines · Greg Kroah-Hartman

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Oh, and if I've missed any patches that people have sent me already, please let me know, because I don't have them anymore.

Quoted 6 lines

Greg,

What about my "staging: comedi: drivers: use comedi_fc.h cmdtest helpers"?

It's quite large but does have decent diffstat:

46 files changed, 766 insertions(+), 1997 deletions(-)

Care to resend it? I thought that was part of the __user rework, my apologies.

Quoted 5 lines

If it doesn't apply due to conflicts, or you would rather just wait until 3.7-rc1, it's not a problem.

I have updated the patch to fix the typo Ian pointed out and to remove the Reported-by signoff from Dan if you would like me to repost it.

Please redo it and resend it, that must have been why I didn't apply it, I was waiting for a newer version :)

thanks,

greg k-h

#4 lore raw
Quoted 13 lines · Greg Kroah-Hartman
Quoted 12 lines · H Hartley Sweeten
Quoted 8 lines · Greg Kroah-Hartman
Quoted 4 lines · Greg Kroah-Hartman

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Oh, and if I've missed any patches that people have sent me already, please let me know, because I don't have them anymore.

Greg,

Quoted 7 lines
Quoted 4 lines

What about my "staging: comedi: drivers: use comedi_fc.h cmdtest helpers"?

It's quite large but does have decent diffstat:

46 files changed, 766 insertions(+), 1997 deletions(-)

Care to resend it? I thought that was part of the __user rework, my apologies.

Not a problem. Just reposted it (v2).

Quoted 8 lines
Quoted 5 lines

If it doesn't apply due to conflicts, or you would rather just wait until 3.7-rc1, it's not a problem.

I have updated the patch to fix the typo Ian pointed out and to remove the Reported-by signoff from Dan if you would like me to repost it.

Please redo it and resend it, that must have been why I didn't apply it, I was waiting for a newer version :)

If there is a merge issue please let me know. If so I'll wait until 3.7-rc1 is out and rebase the patch.

Thanks!
Hartley

#5 lore raw
In reply to Greg Kroah-Hartman
Quoted 8 lines · Greg Kroah-Hartman
Quoted 4 lines · Greg Kroah-Hartman

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Oh, and if I've missed any patches that people have sent me already, please let me know, because I don't have them anymore.

I have an outstanding patch for the jr3_pci driver that was mostly __iomem tagging, but also included a one-line fix for an invalid iomem dereference. Do you want me to resend the whole patch or just split out the one-line fix for 3.6?

Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-
#6 lore raw
Quoted 7 lines · Ian Abbott
Quoted 6 lines · Greg Kroah-Hartman
Quoted 4 lines · Greg Kroah-Hartman

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Quoted 7 lines
Quoted 2 lines

Oh, and if I've missed any patches that people have sent me already, please let me know, because I don't have them anymore.

I have an outstanding patch for the jr3_pci driver that was mostly __iomem tagging, but also included a one-line fix for an invalid iomem dereference. Do you want me to resend the whole patch or just split out the one-line fix for 3.6?

The one line fix for now would be great, and then the __iomem one to apply after that for 3.7 would be also ok.

Can you resend those?

thanks,

greg k-h

#7 lore raw
Quoted 16 lines · Greg Kroah-Hartman
Quoted 7 lines · Ian Abbott
Quoted 6 lines · Greg Kroah-Hartman
Quoted 4 lines · Greg Kroah-Hartman

With 3.6 about to be released, I've now closed the 3.7 staging-next tree for new features / cleanups. It's bug-fixes only now until 3.7-rc1 is out.

Quoted 7 lines
Quoted 2 lines

Oh, and if I've missed any patches that people have sent me already, please let me know, because I don't have them anymore.

I have an outstanding patch for the jr3_pci driver that was mostly __iomem tagging, but also included a one-line fix for an invalid iomem dereference. Do you want me to resend the whole patch or just split out the one-line fix for 3.6?

Quoted 4 lines

The one line fix for now would be great, and then the __iomem one to apply after that for 3.7 would be also ok.

Can you resend those?

Okay, I've sent the one-line fix. I'll send the rest of it when the staging-next tree reopens.

Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-