Messages in this thread | | | Date | Thu, 31 Jul 2014 17:20:17 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the tip tree |
| |
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 > 0a8adf584759 ("test: add firmware_class loader test") from the > driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good, thanks.
greg k-h
| |