From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752648AbcFCIuU (ORCPT ); Fri, 3 Jun 2016 04:50:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46934 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752290AbcFCIuS convert rfc822-to-8bit (ORCPT ); Fri, 3 Jun 2016 04:50:18 -0400 Message-ID: <1464943816.24775.135.camel@redhat.com> Subject: Re: [PATCH v2 5/9] arm64: Add BCM2835 support to the defconfig. From: Gerd Hoffmann To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, Eric Anholt , Will Deacon , open list , Catalin Marinas Date: Fri, 03 Jun 2016 10:50:16 +0200 In-Reply-To: <3299125.qWct7BqQgQ@wuerfel> References: <1464934708-24769-1-git-send-email-kraxel@redhat.com> <1464934708-24769-6-git-send-email-kraxel@redhat.com> <3299125.qWct7BqQgQ@wuerfel> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Mime-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 03 Jun 2016 08:50:18 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? cheers, Gerd