Messages in this thread | | | Date | Mon, 4 Aug 2014 11:27:03 -0700 | Subject | Re: linux-next: manual merge of the driver-core tree with the tip tree | From | John Stultz <> |
| |
On Fri, Aug 1, 2014 at 4:38 PM, Kees Cook <keescook@chromium.org> wrote: > On Thu, Jul 31, 2014 at 8:20 PM, Greg KH <greg@kroah.com> 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 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. > > For keeping things regularized, could this module instead be named > "test_udelay", to match the rest of most of the test modules? > (Starting with "test_".)
Sure. I'll spin up a patch to change it and will submit here shortly.
thanks -john
| |