linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Mark Brown <broonie@kernel.org>
Cc: Thierry Reding <thierry.reding@gmail.com>,
	Guenter Roeck <linux@roeck-us.net>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for Oct 24
Date: Fri, 25 Oct 2013 06:33:43 -0700	[thread overview]
Message-ID: <CAOesGMjuT0ntb6awo0PVtccqvFfo_Lzj1zyGNX=C4BrVLBow7w@mail.gmail.com> (raw)
In-Reply-To: <20131025132422.GC12932@sirena.org.uk>

On Fri, Oct 25, 2013 at 6:24 AM, Mark Brown <broonie@kernel.org> wrote:
> On Fri, Oct 25, 2013 at 06:16:02AM -0700, Olof Johansson wrote:
>> On Fri, Oct 25, 2013 at 1:35 AM, Thierry Reding
>
>> > Yeah, I saw the devm_gpio_request_one() errors too. They happened for 3
>> > boards on ARM I think. Must have forgotten to update the summary email.
>> > I'll see if I can come up with a patch to fix the GPIO related build
>> > failures, or at least report it to LinusW or Alexandre.
>
>> Hmm.
>
>> Please don't apply fixes like these directly to your tree, keep the
>> broken parts (or drop the tree that introduced it). It makes the
>> process of getting the fixes in where they really have to go much more
>> error prone, since there's no way to track whether they have landed in
>> the right place yet or not.
>
> The rule I was applying (which I think is the same as Stephen applies)
> is that I'd fix anything that was definitely the result of a merge issue
> (like the build failure in misc due to a sysfs API change in the sysfs
> tree) but not anything that was just plain broken in the tree in
> isolation.

Some of those might still make sense, but as many as possible of them
should be pushed down into the trees where they belong, even if
they're strictly not needed there (as long as they don't break the
standalone tree, of course).


-Olof

  reply	other threads:[~2013-10-25 13:33 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-24 20:02 ` linux-next: Tree for Oct 24 (xilinx_uartps) Randy Dunlap
2013-10-25  5:02 ` linux-next: Tree for Oct 24 Guenter Roeck
2013-10-25  8:35   ` Thierry Reding
2013-10-25 13:16     ` Olof Johansson
2013-10-25 13:24       ` Mark Brown
2013-10-25 13:33         ` Olof Johansson [this message]
2013-10-25 15:45           ` Mark Brown
2013-10-25 13:35       ` Thierry Reding
2013-10-25 13:43         ` Olof Johansson
2013-10-25 14:17           ` Thierry Reding
2013-10-25 15:02             ` Guenter Roeck
2013-10-25 15:17               ` Thierry Reding
2013-10-25 17:17                 ` Guenter Roeck
2013-10-25 18:04                   ` Geert Uytterhoeven
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03   ` linux-next: manual merge of the h8300-remove tree Thierry Reding
2013-10-25 13:35     ` Mark Salter
2013-10-25 15:09     ` Guenter Roeck
2013-10-25 13:03   ` linux-next: manual merge of the mfd-lj tree Thierry Reding
2013-10-25 13:03   ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-25 13:25     ` Will Deacon
2013-10-26  8:40       ` Ingo Molnar
2013-10-26 14:01         ` Will Deacon
2013-10-27  7:12           ` Ingo Molnar
2013-10-27 10:00             ` Russell King - ARM Linux
2013-10-28  7:47               ` Thierry Reding
2013-10-28  8:45                 ` Russell King - ARM Linux
2013-10-25 13:03   ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-25 13:07     ` Marc Zyngier
2013-10-25 13:03   ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-25 13:22   ` linux-next: manual merge of the c6x tree Mark Salter
2013-10-25 13:36     ` Thierry Reding
2013-10-26 13:19   ` Russell King - ARM Linux
2013-10-28  7:34     ` Thierry Reding
  -- strict thread matches above, loose matches on Subject: below --
2023-10-24  6:48 linux-next: Tree for Oct 24 Stephen Rothwell
2022-10-24  4:17 Stephen Rothwell
2019-10-24  5:55 Stephen Rothwell
2016-10-24  3:02 Stephen Rothwell
2012-10-24  4:19 Stephen Rothwell

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='CAOesGMjuT0ntb6awo0PVtccqvFfo_Lzj1zyGNX=C4BrVLBow7w@mail.gmail.com' \
    --to=olof@lixom.net \
    --cc=broonie@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=thierry.reding@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).