linux-next: manual merge of the driver-core tree with Linus' tree
in [Kernel]
|
Prev: Panic at tcp_xmit_retransmit_queue
Next: [PATCH] [NETLINK]: With opcode INET_DIAG_BC_S_LE dport was compared in inet_diag_bc_run()
From: Greg KH on 19 Jan 2010 16:20 On Mon, Jan 18, 2010 at 06:49:56PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/base/memory.c between commit > 8ff410daa009c4b44be445ded5b0cec00abc0426 ("sysdev: fix prototype for > memory_sysdev_class show/store functions") from Linus' tree and commits > 95f4918fb2826dd7fc7be8a375ee0b71e8276a62 ("sysdev: Fix type of sysdev > class attribute in memory driver") and > 18a994bc1df640e77b853af5b6a175d6871b449f ("driver-core: Add attribute > argument to class_attribute show/store") from the driver-core tree. > > Not a big suprise. I fixed it up by using the driver-core tree version > (effectively reverting the version in Linus' tree). I've fixed this up in my tree now. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 19 Jan 2010 18:50
Hi Greg, On Tue, 19 Jan 2010 12:59:12 -0800 Greg KH <greg(a)kroah.com> wrote: > > On Mon, Jan 18, 2010 at 06:49:56PM +1100, Stephen Rothwell wrote: > > > > Today's linux-next merge of the driver-core tree got a conflict in > > drivers/base/memory.c between commit > > 8ff410daa009c4b44be445ded5b0cec00abc0426 ("sysdev: fix prototype for > > memory_sysdev_class show/store functions") from Linus' tree and commits > > 95f4918fb2826dd7fc7be8a375ee0b71e8276a62 ("sysdev: Fix type of sysdev > > class attribute in memory driver") and > > 18a994bc1df640e77b853af5b6a175d6871b449f ("driver-core: Add attribute > > argument to class_attribute show/store") from the driver-core tree. > > > > Not a big suprise. I fixed it up by using the driver-core tree version > > (effectively reverting the version in Linus' tree). > > I've fixed this up in my tree now. Excellent, thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |