Re: linux-next: manual merge of the driver-core tree with the tip tree

2014-08-04 Thread John Stultz
On Fri, Aug 1, 2014 at 4:38 PM, Kees Cook wrote: > On Thu, Jul 31, 2014 at 8:20 PM, Greg KH wrote: >> On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote: >>> Hi Greg, >>> >>> Today's linux-next merge of the driver-core tree got a conflict in >>> lib/Kconfig.debug between commit e704

Re: linux-next: manual merge of the driver-core tree with the tip tree

2014-08-03 Thread Greg KH
On Fri, Aug 01, 2014 at 07:38:26PM -0400, Kees Cook wrote: > On Thu, Jul 31, 2014 at 8:20 PM, Greg KH wrote: > > On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote: > >> Hi Greg, > >> > >> Today's linux-next merge of the driver-core tree got a conflict in > >> lib/Kconfig.debug betwe

Re: linux-next: manual merge of the driver-core tree with the tip tree

2014-08-01 Thread Kees Cook
On Thu, Jul 31, 2014 at 8:20 PM, Greg KH wrote: > On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote: >> Hi Greg, >> >> Today's linux-next merge of the driver-core tree got a conflict in >> lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add >> udelay_test module to val

Re: linux-next: manual merge of the driver-core tree with the tip tree

2014-07-31 Thread Greg KH
On Thu, Jul 31, 2014 at 05:07:35PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > lib/Kconfig.debug between commit e704f93af5a0 ("kernel: time: Add > udelay_test module to validate udelay") from the tip tree and commit > 0a8adf584

Re: linux-next: manual merge of the driver-core tree with the tip tree

2013-04-11 Thread Greg KH
On Thu, Apr 11, 2013 at 03:30:23PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > kernel/rtmutex-tester.c between commit 8184004ed7a0 > ("locking/rtmutex/tester: Set correct permissions on sysfs files") from > the tip tree and com

Re: linux-next: manual merge of the driver-core tree with the tip tree

2012-11-28 Thread Greg KH
On Thu, Nov 29, 2012 at 03:24:11PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > lib/Makefile between commit e6459606b04e ("lib: Add early cpio decoder") > from the tip tree and commit 610141ee651c ("lib: kobject_uevent is no > l