From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752519AbcFCI6M (ORCPT ); Fri, 3 Jun 2016 04:58:12 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:50058 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751863AbcFCI6G (ORCPT ); Fri, 3 Jun 2016 04:58:06 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Gerd Hoffmann , Catalin Marinas , Will Deacon , open list , Eric Anholt , linux-rpi-kernel@lists.infradead.org Subject: Re: [PATCH v2 5/9] arm64: Add BCM2835 support to the defconfig. Date: Fri, 03 Jun 2016 10:58:15 +0200 Message-ID: <4620705.YUQPYFzgRD@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <1464943816.24775.135.camel@redhat.com> References: <1464934708-24769-1-git-send-email-kraxel@redhat.com> <3299125.qWct7BqQgQ@wuerfel> <1464943816.24775.135.camel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:gtSsaK60ZdKGTFvQjj5nzHlvypY3YBshC8JxvMShRJZwywdGPNn wcdMfC++XM1Gl447k/gE9TEo+tr4zVuos+y6P+ja0o/xj58US1WJGVCCul004a4Xwk2Y+ua uESxfY8krMGf5SMB28+yuZkFziy0TwwhOduH5jbwPuR0oJbQ9cBxzy4bIvcTJM/kU3hxhnQ xhmJm639C1lx6QL+Sh9JA== X-UI-Out-Filterresults: notjunk:1;V01:K0:LhBv1uYU5VA=:KPmJw+ocytTFOJf1UiGfZS AJjjkD0lU3vibS3ulTisUFzmz8Ar6FQKHn9Sxe6yNR/RJUhNtIR722jZIo7cNsAUnj29SH8PP SZKFEA1Lb9aoGyqCITNU/lazT2AljY3DolpYY8xjqVjXgjJwCNqJJ9ZFMO2ULic5FsUuGMgtg 8icVO3/q5H2luxrXgqIrxlJfTRUtCBTLaLfVvINlmK+h+movenwZmBvAxm7UsVPjxuDjT4sKU iDmfjp7TWV5aHn+HQbuQT4PLmCKNkPnbO8NnvN1GpFy9ag8ZnF+iNVZfggMHcThwJzRPx5Sb2 c0vtvLoAnbskaRoj9SwqOsUsxwuw8diGWOx7onIEqHJ6zQnixeLSNTku+a8PIPuhD4SLIeQA2 Ex5/uOTP2yCfP0pmdGrqwlwNs7qn+NtrjH/b8Kz8kbZlPBEMubiwmPMD8FVYzReorNKxHtR1U dkggkZvwnFsCmV80ZEaS5LKVQ9qX2mPB2B5lFO9LeGmGoQawW9xzKNFPzuK6UlurHx7QnMbw7 hcLURwUBH9CCUbw+UhVOrW1j4YMBs9WAx0sRCdY0Ltj9BVWWHvevFjI6El8lgfIteBaDgz2xJ m+FTjdCA0zuAGiRoyrvxblCGVyagDa39cA2kN3NmPdCTxuTJi9dlDLxuoP5LPob0arPpy9nXC Q457H1t84Dbp5AQYrwzaAw5cztHnOaK6KgApI/cGiPBnTlRJ3NZQ9wXKlh6oKhOlwDipsZUBg lhPCyGzVs7DHf8Gw Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, June 3, 2016 10:50:16 AM CEST Gerd Hoffmann wrote: > On Fr, 2016-06-03 at 09:36 +0200, Arnd Bergmann wrote: > > On Friday, June 3, 2016 8:18:24 AM CEST Gerd Hoffmann wrote: > > > From: Eric Anholt > > > > > > Made with make defconfig; make menuconfig (only saying Y to new > > > entries); make savedefconfig. > > > > Please try not to mix 'make savedefconfig' changes with your > > own changes, it make it harder to review and can lead to more > > conflicts. > > This is just conflicts resolved by hand after 4.6 -> 4.7-rc1 rebase, > latest version didn't actually ran through savedefconfig. Probably some > unwanted changes made it in by accident this way. > > Guess I better redo this from scratch. > > What is the suggested procedure to generate defconfig patches? I tend to just edit the files by hand, or use 'make savedefconfig' to create an initial version, and then use 'vimdiff' to revert the changes I don't want. Arnd