On Wed, Oct 16, 2013 at 10:30:25PM +0200, Thierry Reding wrote: > On Wed, Oct 16, 2013 at 12:44:40PM -0700, Greg Kroah-Hartman wrote: > > On Wed, Oct 16, 2013 at 12:41:08PM -0700, Randy Dunlap wrote: > > > On 10/16/13 12:26, Greg Kroah-Hartman wrote: > > > > On Mon, Oct 14, 2013 at 12:38:06PM -0700, Randy Dunlap wrote: > > > >> From: Randy Dunlap <rdun...@infradead.org> > > > >> > > > >> Fix various build errors (on x86_64) for drivers/misc/mic/host/: > > > >> > > > >> drivers/misc/mic/host/mic_main.c:378:3: error: too many arguments to > > > >> function 'sysfs_get_dirent' > > > >> drivers/misc/mic/host/mic_intr.h:134:58: warning: 'struct pci_dev' > > > >> declared inside parameter list [enabled by default] > > > >> drivers/misc/mic/host/mic_intr.h:134:58: warning: its scope is only > > > >> this definition or declaration, which is probably not what you want > > > >> [enabled by default] > > > >> drivers/misc/mic/host/mic_intr.h:135:58: warning: 'struct pci_dev' > > > >> declared inside parameter list [enabled by default] > > > >> drivers/misc/mic/host/mic_device.h:169:2: error: implicit > > > >> declaration of function 'ioread32' > > > >> [-Werror=implicit-function-declaration] > > > >> drivers/misc/mic/host/mic_device.h: In function 'mic_mmio_read': > > > >> drivers/misc/mic/host/mic_device.h:169:2: error: implicit > > > >> declaration of function 'ioread32' > > > >> [-Werror=implicit-function-declaration] > > > >> drivers/misc/mic/host/mic_device.h: In function 'mic_mmio_write': > > > >> drivers/misc/mic/host/mic_device.h:183:2: error: implicit > > > >> declaration of function 'iowrite32' > > > >> [-Werror=implicit-function-declaration] > > > >> > > > >> Signed-off-by: Randy Dunlap <rdun...@infradead.org> > > > >> Cc: Harshavardhan R Kharche <harshavardhan.r.khar...@intel.com> > > > >> Cc: Ashutosh Dixit <ashutosh.di...@intel.com> > > > >> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> > > > >> Cc: Nikhil Rao <nikhil....@intel.com> > > > >> Cc: Sudeep Dutt <sudeep.d...@intel.com> > > > > > > > > This is a -next issue only at this point in time, I thought it was in > > > > the -next tree as a "fixup" already? > > > > > > Are you asking the driver maintainers? > > > > No, the linux-next maintainers. > > > > The driver maintainers have nothing to do with this, it's a sysfs change > > in my driver-core tree that causes this issue. > > Well, we do carry a patch to fix this, but that generally doesn't get > carried to Linus' tree automatically as far as I know. So I guess it's > fine for now, but when the merge window opens you'll need to make sure > that Linus merges the branches in the correct order so that the build > doesn't break in between.
Yes, I'll do that as part of my normal tree submission process. > I think the typical way to solve this kind of build dependencies between > trees is for one tree to provide a stable branch that can be merged into > the other. That ensures that each tree can still be built independently. I don't do that for my different trees, sorry, especially for staging drivers, they can break all the time, no one really cares :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
