staging tree closed for 3.7

staging tree closed for 3.7

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

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

Re: staging tree closed for 3.7

[Greg Kroah-Hartman]

On Wed, Sep 26, 2012 at 10:56:06AM -0700, Greg Kroah-Hartman wrote:
> 
> 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

RE: staging tree closed for 3.7

[H Hartley Sweeten]

On Wednesday, September 26, 2012 10:57 AM, Greg Kroah-Hartman wrote:
> On Wed, Sep 26, 2012 at 10:56:06AM -0700, Greg Kroah-Hartman wrote:
>> 
>> 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

Re: staging tree closed for 3.7

[Greg Kroah-Hartman]

On Wed, Sep 26, 2012 at 01:47:11PM -0500, H Hartley Sweeten wrote:
> On Wednesday, September 26, 2012 10:57 AM, Greg Kroah-Hartman wrote:
> > On Wed, Sep 26, 2012 at 10:56:06AM -0700, Greg Kroah-Hartman wrote:
> >> 
> >> 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(-)

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

> 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

RE: staging tree closed for 3.7

[H Hartley Sweeten]

On Wednesday, September 26, 2012 1:05 PM, Greg Kroah-Hartman wrote:
> On Wed, Sep 26, 2012 at 01:47:11PM -0500, H Hartley Sweeten wrote:
>> On Wednesday, September 26, 2012 10:57 AM, Greg Kroah-Hartman wrote:
>>> On Wed, Sep 26, 2012 at 10:56:06AM -0700, Greg Kroah-Hartman wrote:
>>>> 
>>>> 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(-)
>
> Care to resend it?  I thought that was part of the __user rework, my
> apologies.

Not a problem. Just reposted it (v2).

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

Re: staging tree closed for 3.7

[Ian Abbott]

On 2012-09-26 18:56, Greg Kroah-Hartman wrote:
> On Wed, Sep 26, 2012 at 10:56:06AM -0700, Greg Kroah-Hartman wrote:
>>
>> 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?

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-

Re: staging tree closed for 3.7

[Greg Kroah-Hartman]

On Thu, Sep 27, 2012 at 10:31:17AM +0100, Ian Abbott wrote:
> On 2012-09-26 18:56, Greg Kroah-Hartman wrote:
> >On Wed, Sep 26, 2012 at 10:56:06AM -0700, Greg Kroah-Hartman wrote:
> >>
> >>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?

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

Re: staging tree closed for 3.7

[Ian Abbott]

On 2012-09-27 16:35, Greg Kroah-Hartman wrote:
> On Thu, Sep 27, 2012 at 10:31:17AM +0100, Ian Abbott wrote:
>> On 2012-09-26 18:56, Greg Kroah-Hartman wrote:
>>> On Wed, Sep 26, 2012 at 10:56:06AM -0700, Greg Kroah-Hartman wrote:
>>>>
>>>> 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?
>
> 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.

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-