From: Linus Walleij <linus.walleij@linaro.org>
To: viresh kumar <viresh.kumar@st.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Pratyush ANAND <pratyush.anand@st.com>,
Rajeev KUMAR <rajeev-dlh.kumar@st.com>,
Bhavna YADAV <bhavna.yadav@st.com>,
Bhupesh SHARMA <bhupesh.sharma@st.com>,
Armando VISCONTI <armando.visconti@st.com>,
"grant.likely@secretlab.ca" <grant.likely@secretlab.ca>,
Vipin KUMAR <vipin.kumar@st.com>,
Shiraz HASHIM <shiraz.hashim@st.com>,
Amit VIRDI <Amit.VIRDI@st.com>,
Vipul Kumar SAMAR <vipulkumar.samar@st.com>,
"viresh.linux@gmail.com" <viresh.linux@gmail.com>,
Deepak SIKRI <deepak.sikri@st.com>,
"spi-devel-general@lists.sourceforge.net"
<spi-devel-general@lists.sourceforge.net>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 0/6] spi/spi-pl022 fixes
Date: Wed, 10 Aug 2011 09:20:43 +0200 [thread overview]
Message-ID: <CAKnu2MoTQTYMa4JvWyr7sPMhPyziTtnLeZLySUYxcuQC2Vu-6Q@mail.gmail.com> (raw)
In-Reply-To: <4E420144.4010001@st.com>
2011/8/10 viresh kumar <viresh.kumar@st.com>:
> On 08/10/2011 01:40 AM, Linus Walleij wrote:
>>
>> They all work perfectly well on top of v3.1-rc1, please use
>> mainline kernel tags as patch base if you can.
>
> Sure, can take care of this. But i have a doubt here,
> What if a patch on the same driver is applied after kernel tag.
> Shouldn't i rebase my patches on the latest commit available.
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?
Thanks,
Linus Walleij
WARNING: multiple messages have this Message-ID (diff)
From: linus.walleij@linaro.org (Linus Walleij)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 0/6] spi/spi-pl022 fixes
Date: Wed, 10 Aug 2011 09:20:43 +0200 [thread overview]
Message-ID: <CAKnu2MoTQTYMa4JvWyr7sPMhPyziTtnLeZLySUYxcuQC2Vu-6Q@mail.gmail.com> (raw)
In-Reply-To: <4E420144.4010001@st.com>
2011/8/10 viresh kumar <viresh.kumar@st.com>:
> On 08/10/2011 01:40 AM, Linus Walleij wrote:
>>
>> They all work perfectly well on top of v3.1-rc1, please use
>> mainline kernel tags as patch base if you can.
>
> Sure, can take care of this. But i have a doubt here,
> What if a patch on the same driver is applied after kernel tag.
> Shouldn't i rebase my patches on the latest commit available.
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?
Thanks,
Linus Walleij
next prev parent reply other threads:[~2011-08-10 7:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-09 11:05 [PATCH 0/6] spi/spi-pl022 fixes Viresh Kumar
2011-08-09 11:05 ` Viresh Kumar
[not found] ` <cover.1312887860.git.viresh.kumar-qxv4g6HH51o@public.gmane.org>
2011-08-09 11:05 ` [PATCH 1/6] spi/spi-pl022: Resolve formatting issues Viresh Kumar
2011-08-09 11:05 ` Viresh Kumar
2011-08-09 11:05 ` [PATCH 2/6] spi/spi-pl022: Use GFP_NOWAIT for allocation from tasklet Viresh Kumar
2011-08-09 11:05 ` Viresh Kumar
2011-08-09 11:26 ` Jassi Brar
2011-08-09 11:26 ` Jassi Brar
[not found] ` <CABb+yY3CuYqNcpvdP8fa6FsaN3EBDAXivKSP56gRh6-oPyp2Mg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-08-10 3:27 ` viresh kumar
2011-08-10 3:27 ` viresh kumar
2011-08-09 11:05 ` [PATCH 3/6] spi/spi-pl022: Don't allocate more sg than required Viresh Kumar
2011-08-09 11:05 ` Viresh Kumar
2011-08-09 11:05 ` [PATCH 4/6] spi/spi-pl022: calculate_effective_freq() must set rate <= requested rate Viresh Kumar
2011-08-09 11:05 ` Viresh Kumar
[not found] ` <CACRpkdYAkPtOkVuF-UhpFHugvZpw_owmgoxP_opF8KE=cYF95w@mail.gmail.com>
2011-08-10 3:36 ` viresh kumar
2011-08-10 3:36 ` viresh kumar
2011-08-09 11:05 ` [PATCH 5/6] spi/spi-pl022: Call pl022_dma_remove(pl022) only if enable_dma is true Viresh Kumar
2011-08-09 11:05 ` Viresh Kumar
2011-08-09 11:05 ` [PATCH 6/6] spi/spi-pl022: Request/free DMA channels as and when required Viresh Kumar
2011-08-09 11:05 ` Viresh Kumar
2011-08-09 20:10 ` [PATCH 0/6] spi/spi-pl022 fixes Linus Walleij
2011-08-09 20:10 ` Linus Walleij
2011-08-10 3:55 ` viresh kumar
2011-08-10 3:55 ` viresh kumar
2011-08-10 7:20 ` Linus Walleij [this message]
2011-08-10 7:20 ` Linus Walleij
[not found] ` <CAKnu2MoTQTYMa4JvWyr7sPMhPyziTtnLeZLySUYxcuQC2Vu-6Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-08-10 14:12 ` Arnd Bergmann
2011-08-10 14:12 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKnu2MoTQTYMa4JvWyr7sPMhPyziTtnLeZLySUYxcuQC2Vu-6Q@mail.gmail.com \
--to=linus.walleij@linaro.org \
--cc=Amit.VIRDI@st.com \
--cc=armando.visconti@st.com \
--cc=arnd@arndb.de \
--cc=bhavna.yadav@st.com \
--cc=bhupesh.sharma@st.com \
--cc=deepak.sikri@st.com \
--cc=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=pratyush.anand@st.com \
--cc=rajeev-dlh.kumar@st.com \
--cc=shiraz.hashim@st.com \
--cc=spi-devel-general@lists.sourceforge.net \
--cc=vipin.kumar@st.com \
--cc=vipulkumar.samar@st.com \
--cc=viresh.kumar@st.com \
--cc=viresh.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.