On Tue, May 12, 2015 at 11:20:07AM -0500, Joe Hershberger wrote:
Hi Tom,
On Tue, May 12, 2015 at 10:18 AM, Tom Rini trini@konsulko.com wrote:
On Mon, May 11, 2015 at 01:32:40PM -0500, Joe Hershberger wrote:
Hi Tom,
On Mon, May 11, 2015 at 12:08 PM, Joe Hershberger joe.hershberger@ni.com wrote:
In order to reduce merge conflicts and to maintain the simplest possible defconfig files, we should be using the savedefconfig feature of Kconfig every time a new feature is added. This keeps the defconfig settings to a minimum (only those things not default) and keeps them in the same order as the Kconfig options.
Signed-off-by: Joe Hershberger joe.hershberger@ni.com Cc: Masahiro Yamada yamada.masahiro@socionext.com
This is easy to generate, but as you can imagine it will become a conflict rapidly. Please let me know if you choose to wait past today on this... if you do, let me know when you want to pull it in and I can generate it again. We should coordinate.
I'm taking what you and Stephen talked about as "changes will be coming" and not applying this patch.
That's correct. I'm running a test now. Are you about to push more changes that include defconfig or Kconfig changes or am I safe with the current HEAD to generate this patch?
You're safe to continue. Please cc Stephen on that one since I'll want his ack before I grab it. Thanks!