From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH 0/6] spi/spi-pl022 fixes Date: Wed, 10 Aug 2011 16:12:51 +0200 Message-ID: <201108101612.51825.arnd@arndb.de> References: <4E420144.4010001@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Pratyush ANAND , viresh kumar , Rajeev KUMAR , Bhavna YADAV , Bhupesh SHARMA , Armando VISCONTI , Vipin KUMAR , Shiraz HASHIM , Amit VIRDI , Vipul Kumar SAMAR , Deepak SIKRI , "spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org" , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" To: Linus Walleij Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: linux-spi.vger.kernel.org On Wednesday 10 August 2011, Linus Walleij wrote: > The basic assumption is that patches are orthogonal and apply > without conflicts, i.e. patch different parts of the kernel tree or > different lines in the same file. > > Second assumption is that if patches do collide, the subsystem > maintainer can solve most conflicts, and is expected to do > so. Torvalds sets an example by requesting that subsystem > maintainers do not fixup conflicts between subsystems so he > can see them himself. > > Then there are special cases when you get a strong > coupling between patches. > > In these special cases, ask the subsystem maintainer what to > base the patches on. Usually it's some commit on the subsystem > tree rather than -next. > > This is my understanding of how we work, maybe I should > patch Documentation/development-process/*, Arnd do you have > anything to add? No, your explanations are pretty much what I would have said. Arnd ------------------------------------------------------------------------------ uberSVN's rich system and user administration capabilities and model configuration take the hassle out of deploying and managing Subversion and the tools developers use with it. Learn more about uberSVN and get a free download at: http://p.sf.net/sfu/wandisco-dev2dev From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Wed, 10 Aug 2011 16:12:51 +0200 Subject: [PATCH 0/6] spi/spi-pl022 fixes In-Reply-To: References: <4E420144.4010001@st.com> Message-ID: <201108101612.51825.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wednesday 10 August 2011, Linus Walleij wrote: > The basic assumption is that patches are orthogonal and apply > without conflicts, i.e. patch different parts of the kernel tree or > different lines in the same file. > > Second assumption is that if patches do collide, the subsystem > maintainer can solve most conflicts, and is expected to do > so. Torvalds sets an example by requesting that subsystem > maintainers do not fixup conflicts between subsystems so he > can see them himself. > > Then there are special cases when you get a strong > coupling between patches. > > In these special cases, ask the subsystem maintainer what to > base the patches on. Usually it's some commit on the subsystem > tree rather than -next. > > This is my understanding of how we work, maybe I should > patch Documentation/development-process/*, Arnd do you have > anything to add? No, your explanations are pretty much what I would have said. Arnd