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
