linux-next: Tree for March 20

linux-next: Tree for March 20

[Stephen Rothwell]

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

Hi all,

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(tar balls at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64.

I have started this tree by reverting the following:
driver-core/driver-core-remove-no-longer-used-struct-class_device.patch
	should be merged late
driver-core/ib-convert-struct-class_device-to-struct-device.patch
	conflicts with the infiniband tree
driver-core/pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch
	breaks non CONFIG_PM builds of drivers/serial/serial_core.c

There were a few merge conflicts (fairly trivial).

I have added POWERPC-really-export-empty_zero_page.patch and reverted
async-tx commit 9974693221954ef1019f87d32ae26a0757d2ee85 ("dmaengine: ack
to flags: make use of the unused bits in the 'ack' field") as these are
still needed to make powerpc allmodconfig build (in particular ext4 and
drivers/dma/fsldma.c).  These have been reported previously.

We are up to 48 trees, more are welcome (even if they are currently
empty).  The influx of new trees has slowed completely.  Thanks to those
who have contributed, and to those who haven't, please do.

In particular, I have very few of the architecture trees ....

Status of my local build tests is at
http://kisskb.ellerman.id.au/linux-next.  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: Tree for March 20

[Randy Dunlap]

On Thu, 20 Mar 2008 14:39:53 +1100 Stephen Rothwell wrote:

> Hi all,
> 
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> (tar balls at
> http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).

gcc doesn't like nested /* comments:

next-20080320/drivers/media/video/bt8xx/bttv-cards.c:3030:38: warning: "/*" within comment
next-20080320/drivers/media/video/bt8xx/bttv-cards.c:3032:20: warning: "/*" within comment

---
~Randy

Re: linux-next: Tree for March 20

[Greg KH]

On Thu, Mar 20, 2008 at 02:39:53PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> (tar balls at
> http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).
> 
> You can see which trees have been included by looking in the Next/Trees
> file in the source.  There are also quilt-import.log and merge.log files
> in the Next directory.  Between each merge, the tree was built with
> a ppc64_defconfig for powerpc and an allmodconfig for x86_64.
> 
> I have started this tree by reverting the following:
> driver-core/driver-core-remove-no-longer-used-struct-class_device.patch
> 	should be merged late
> driver-core/ib-convert-struct-class_device-to-struct-device.patch
> 	conflicts with the infiniband tree
> driver-core/pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch
> 	breaks non CONFIG_PM builds of drivers/serial/serial_core.c

These should be fixed tomorrow, I have new ones in my inbox to solve
these issues (I hope...)

thanks,

greg k-h

Re: linux-next: Tree for March 20

[Stephen Rothwell]

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

On Wed, 19 Mar 2008 21:57:19 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Mar 20, 2008 at 02:39:53PM +1100, Stephen Rothwell wrote:
> > 
> > I have started this tree by reverting the following:
> > driver-core/driver-core-remove-no-longer-used-struct-class_device.patch
> > 	should be merged late
> > driver-core/ib-convert-struct-class_device-to-struct-device.patch
> > 	conflicts with the infiniband tree
> > driver-core/pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch
> > 	breaks non CONFIG_PM builds of drivers/serial/serial_core.c
> 
> These should be fixed tomorrow, I have new ones in my inbox to solve
> these issues (I hope...)

Great, I look forward to it.

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

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

Re: linux-next: Tree for March 20

[Mauro Carvalho Chehab]

On Wed, 19 Mar 2008 21:21:21 -0700
Randy Dunlap <randy.dunlap@oracle.com> wrote:

> On Thu, 20 Mar 2008 14:39:53 +1100 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
> > (tar balls at
> > http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).
> 
> gcc doesn't like nested /* comments:
> 
> next-20080320/drivers/media/video/bt8xx/bttv-cards.c:3030:38: warning: "/*" within comment
> next-20080320/drivers/media/video/bt8xx/bttv-cards.c:3032:20: warning: "/*" within comment

Andrew already did a patch for this. I'll import on my tree.

> 
> ---
> ~Randy
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/




Cheers,
Mauro

Re: linux-next: Tree for March 20

[Stephen Rothwell]

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

Hi Greg,

On Wed, 19 Mar 2008 21:57:19 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Mar 20, 2008 at 02:39:53PM +1100, Stephen Rothwell wrote:
> > 
> > driver-core/driver-core-remove-no-longer-used-struct-class_device.patch
> > 	should be merged late

I still need to revert this so that the scsi tree can build (st.c).

> > driver-core/ib-convert-struct-class_device-to-struct-device.patch
> > 	conflicts with the infiniband tree

This still has the same conflicts, but they are papered over by my use of
git-rerere (which remembers my previous merge fixup and applies it for
me).

> > driver-core/pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch
> > 	breaks non CONFIG_PM builds of drivers/serial/serial_core.c

This one seems to be fixed.

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

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

Re: linux-next: Tree for March 20

[Greg KH]

On Tue, Mar 25, 2008 at 05:48:17PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Wed, 19 Mar 2008 21:57:19 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > On Thu, Mar 20, 2008 at 02:39:53PM +1100, Stephen Rothwell wrote:
> > > 
> > > driver-core/driver-core-remove-no-longer-used-struct-class_device.patch
> > > 	should be merged late
> 
> I still need to revert this so that the scsi tree can build (st.c).

I'll be sending this to Linus after -rc1 comes out, so it's fine that it
needs to be reverted for now.

> > > driver-core/ib-convert-struct-class_device-to-struct-device.patch
> > > 	conflicts with the infiniband tree
> 
> This still has the same conflicts, but they are papered over by my use of
> git-rerere (which remembers my previous merge fixup and applies it for
> me).

Yeah, __FUNCTION__ fun :(

> > > driver-core/pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch
> > > 	breaks non CONFIG_PM builds of drivers/serial/serial_core.c
> 
> This one seems to be fixed.

Glad to hear it.

greg k-h