Re: linux-next: Tree for March 20
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 <[EMAIL PROTECTED]> 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 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: linux-next: Tree for March 20
Hi Greg, On Wed, 19 Mar 2008 21:57:19 -0700 Greg KH <[EMAIL PROTECTED]> 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[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpU6IlGAaek1.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: linux-next: Tree for March 20
On Wed, 19 Mar 2008 21:21:21 -0700 Randy Dunlap <[EMAIL PROTECTED]> 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 [EMAIL PROTECTED] > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ Cheers, Mauro ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: linux-next: Tree for March 20
On Wed, 19 Mar 2008 21:57:19 -0700 Greg KH <[EMAIL PROTECTED]> 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[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgp42hhdxR0tc.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: linux-next: Tree for March 20
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 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: linux-next: Tree for March 20
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 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
