From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751711AbbLaQVq (ORCPT ); Thu, 31 Dec 2015 11:21:46 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:62006 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751104AbbLaQVn convert rfc822-to-8bit (ORCPT ); Thu, 31 Dec 2015 11:21:43 -0500 From: Arnd Bergmann To: Florian Fainelli Cc: Eric Anholt , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stephen Warren , Lee Jones , olof@lixom.net, khilman@kernel.org Subject: Re: [GIT PULL] BCM2835/6 changes for 4.5 (I hope) Date: Thu, 31 Dec 2015 17:21:07 +0100 Message-ID: <2793907.Tpb2ePsxfs@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <568499D7.8030400@gmail.com> References: <1451365282-10505-1-git-send-email-eric@anholt.net> <568499D7.8030400@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" X-Provags-ID: V03:K0:D92DArPK8oEFTHqI7iE+PQx3aOsfRuiaDiNbjTvWLWiRG9ms00H 4Kutq1uo0LZiigQaRTMKlfbGTEpkFCDDVThZeqUgxfl7iBUjN0rxcHMGI0X6FxZvcpwKhqQ sjXGpZ07zc6clvc8qtPwYcvu45FUEpDwj1YRHTI91yrstMjgt5RiWjJHHQluRQjmzFsvNAT /9gIcXQIPJ38cBUmBzngw== X-UI-Out-Filterresults: notjunk:1;V01:K0:kh2rSkKhYVM=:2ZDi0QaBJr9vruGCVDl/H1 qhH1O3iwbXDNf8/RK3QbLdqf0F1TYp2CT52Z9smA+MEmj56w0GWFNivbBf7+joAwb0n51UpX5 gbXO6+Dd5mRmEKTRnXwPEdFBJfVzXi6RwrO5v+coU9NWI71FNFk1CDoeXGe9nw8Ltnym3UBDM /fQW7UFEROEU4IfgFYm7qa/2AxdK26Ha/x1MHST20Rk13xozGAw8tb3guNZ601QtZv1qDelUf exIkmGT4XGnpFr/n1a6qwZb2PF8kyMRdnmaSSa1Nh2Tr94vyg4jDze6bQqowWidB+6uxl702Y D4rLcCV95MFOp0Cq+sraNal9itPcDs6VF/MCMxOPMoa9E1iz4nc0bozEHslFSxxabhWnCL0dj /SezknXp6B7FgoJ8zhbOjkixj5dUBqpxWgjOkWjYv5ymCQTDpffbLlHH7bNt9oHYWeGbQwcJd 2mPtJJFWrhjgl2Wk9kwzp2ZJuWHnfYfi8zOgJ25gLleDRWMc/lYH1xUG5iXvMsuWwsKiHbnSB WaCgml+PWFnfJd1akjf9JFbcFypBC2OnHS+AqT6WF0WJYvHhTAmyVhRvb5gc7wQjC+CN7cE4j EKsGBh6B9HtCpYievptwncGMpngBXSJEHFWGzA4iPQap32aKHAgpuqWypwmD3QHZxY60FOQgO RsuPB5avxiHTaUK2sfBoU375apEDvQQT1T9TBzzzJUFTQW9J8c/DZPInfyORU/E41rK9IHfo9 /sy+za/xGiEgtnn0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday 30 December 2015 18:58:31 Florian Fainelli wrote: > Le 28/12/2015 21:01, Eric Anholt a écrit : > > Apparently this is really late in the process (sorry! I still haven't > > figured out the timelines.), but I'm hoping we could merge these > > changes for 4.5. This includes the Raspberry Pi 2 port, with just two > > minor fixes from the last submission. > > > > The reason I've been pushing hard to get pi2 in is: > > > > 1) It's a lot of conflict resolution every version since it requires > > splitting the 2835 DT file. > > > > 2) People are generally using pi2 these days, so it means people are > > more likely to upstream 2835 driver code if we have an upstream port > > they can run. > > > > Testing status: kbuild test robot builds passed. Boot tested each > > branch head on pi1. Boot tested the merge of all 4 branches on pi1. > > Boot tested the merge of all 4 branches on pi2, with and without the > > irqchip fixes. > > Considering that we are fairly late for v4.5, I would prefer if Arnd, > Olof or Kevin could take these directly into their respective branches, > if this is really really too late, then I will queue these changes, and > the next ones you have for v4.6. > > Thanks and happy holidays! > I've merged them now into the respective branches. However, I only merged the usb-fixes branch for the first two (next/soc and next/drivers) and decided to cherry-pick the patches from the other two branches into next/dt and next/defconfig, to minimize the amount of backmerges when the changes in those branches are clearly not meant to be useful by themselves without at least the first branch merged in as well. Please follow up with one more patch to enable bcm2836 in multi_v7_defconfig. Arnd