Re: [patch 00/17] PNP Lindent

Andrew Morton
2007-07-23T23:00:57Z

On Mon, 23 Jul 2007 16:53:21 -0600
Bjorn Helgaas <bjorn.helgaas@hp.com> wrote:

> On Monday 23 July 2007 04:49:09 pm Andrew Morton wrote:
> > On Mon, 23 Jul 2007 16:39:57 -0600
> > Bjorn Helgaas <bjorn.helgaas@hp.com> wrote:
> > > On Monday 23 July 2007 04:08:52 pm Andrew Morton wrote:
> > > > eep, this is the worst time for me to merge this stuff: I get to carry
> > > > large diffs against lots of files for two months.
> > > >
> > > > The best time to do this would be late(ish) in the 2.6.24 merge window.
> > > >
> > > > Can we do it then?
> > >
> > > Sure. I never know what the right time is. Would that be after 2.6.23
> > > has come out, your big bunch-o-patches has gone to Linus, and shortly
> > > before 2.6.24-rc1?
> > >
> >
> > Yes, that works. I was carrying a Lindent-UFS patch for a month and it
> > broke regularly. But it was trivial to fix: I'd just rerun `Lindent
> > fs/ufs/*.c' to regenerate it. Then reapply the manual-post-lindent-fixups
> > patch on top of that, and fix any remaining rejects.
>
> It sounds like it'd be more convenient for you if I made a single
> Lindent-PNP patch plus a post-lindent-fixups patch, rather than
> separating things by files.

yup

> I'll try to remember to do that after
> 2.6.23 comes out.

thanks.

We could do it now if it's more convenient for you - there's not usually
much happening in that area.