From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-kernel@vger.kernel.org, linus.walleij@linaro.org
Subject: Re: [PATCH 01/49] regulator: ab8500: Further populate initialisation registers
Date: Fri, 8 Feb 2013 10:55:40 +0000 [thread overview]
Message-ID: <20130208105539.GF8879@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20130208082050.GE7519@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 935 bytes --]
On Fri, Feb 08, 2013 at 08:20:50AM +0000, Lee Jones wrote:
> On Thu, 07 Feb 2013, Mark Brown wrote:
> > I tried to apply this but got conflicts - can you please check what's
> > going on with this vs my topic/ab8500 branch?
> It's almost certainly because you're trying to pull the patches in out
> of order. This _will_ end in conflicts. Any chance you can start from
> 01 and work your way though them. I will fixup any that you don't like
> on the fly.
Just following up on our IRC discussion I think that the issue here is
you're basing on -rc not on the topic branch - the patches are going in
pretty much in order, there's no meaningful reordering going on. I am
picking things from the start of the several unrelated topics that are
mixed in randomly in the series but there should be no overlap here.
If you just rebase off the topic branch while you do your fixups git
ought to drop the patches for you most of the time.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-02-08 10:55 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-06 10:53 [PATCH 00/49] Regulators: Bring the AB8500 into the 21st century Lee Jones
2013-02-06 10:53 ` [PATCH 01/49] regulator: ab8500: Further populate initialisation registers Lee Jones
2013-02-07 18:45 ` Mark Brown
2013-02-08 8:20 ` Lee Jones
2013-02-08 10:55 ` Mark Brown [this message]
2013-02-06 10:53 ` [PATCH 02/49] regulator: ab8500: Add set_mode/get_mode support Lee Jones
2013-02-06 10:53 ` [PATCH 03/49] regulator: ab8500: Fix for regulator_set_mode functionality Lee Jones
2013-02-07 18:47 ` Mark Brown
2013-02-06 10:53 ` [PATCH 04/49] regulator: ab8500: Added get_optimum_mode on regulators with idle mode Lee Jones
2013-02-07 18:49 ` Mark Brown
2013-02-06 10:53 ` [PATCH 05/49] ARM: ux500: regulators: Add mask for configuration Lee Jones
2013-02-07 18:51 ` Mark Brown
2013-02-07 19:08 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 06/49] regulator: ab8500: Another push to synchronise recent AB8500 developments Lee Jones
2013-02-06 10:53 ` [PATCH 07/49] regulator: ab8500: Separate regulator and MFD platform data Lee Jones
2013-02-06 10:53 ` [PATCH 08/49] regulator: ab8500: Add support of low voltage battery Lee Jones
2013-02-06 10:53 ` [PATCH 09/49] ARM: ux500: Update displays in vaux1 consumer list Lee Jones
2013-02-07 15:34 ` Linus Walleij
2013-02-07 15:55 ` Mark Brown
2013-02-07 17:50 ` Lee Jones
2013-02-07 19:06 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 10/49] regulator: ab8500-ext: Cosmetic changes Lee Jones
2013-02-06 10:53 ` [PATCH 11/49] regulator: ab8500-ext: Add HW request support Lee Jones
2013-02-06 10:53 ` [PATCH 12/49] regulator: ab8500-ext: Add suspend support Lee Jones
2013-02-06 10:53 ` [PATCH 13/49] regulator: ab8500: Remove USB regulator Lee Jones
2013-02-06 10:53 ` [PATCH 14/49] regulator: ab8500: Init debug from regulator driver Lee Jones
2013-02-06 10:53 ` [PATCH 15/49] ARM: ux500: Add supply for the L3G4200D Gyroscope Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-08 4:25 ` Srinidhi Kasagar
2013-02-06 10:53 ` [PATCH 16/49] ARM: ux500: Add supply for the Proximity and Hal sensor Lee Jones
2013-02-07 15:34 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 17/49] ARM: ux500: Add supply for the Ambient light sensor device Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 18/49] ARM: ux500: Add supply for the Pressure sensor Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 19/49] ARM: ux500: Add supply for the Cypress TrueTouch Touchscreen Lee Jones
2013-02-07 15:36 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 20/49] ARM: ux500: regulators: List the MMIO camera as a consumer of VAUX1 Lee Jones
2013-02-07 15:42 ` Linus Walleij
2013-02-06 10:53 ` [PATCH 21/49] regulator: ab8500: Clean out SoC registers Lee Jones
2013-02-06 10:53 ` [PATCH 22/49] regulator: ab8500: Prepare the driver for additional platforms Lee Jones
2013-02-06 10:53 ` [PATCH 23/49] regulator: ab8500: Add support for the ab9540 Lee Jones
2013-02-06 10:53 ` [PATCH 24/49] regulator: ab8500: Correct TVOUT regulator start-up delay Lee Jones
2013-02-06 10:53 ` [PATCH 25/49] regulator: ab8500-ext: Add support for AB8505/AB9540 Lee Jones
2013-02-06 10:53 ` [PATCH 26/49] ARM: ux500: Partially revert changes surrounding audio regulators Lee Jones
2013-02-07 15:38 ` Linus Walleij
2013-02-07 17:54 ` Lee Jones
2013-02-08 12:10 ` Lee Jones
2013-02-06 10:53 ` [PATCH 27/49] regulator: ab8500: add support for ab8505 Lee Jones
2013-02-06 10:53 ` [PATCH 28/49] ARM: ux500: regulator: Use device IDs instead of device names Lee Jones
2013-02-07 15:43 ` Linus Walleij
2013-02-08 11:13 ` Mark Brown
2013-02-06 10:53 ` [PATCH 29/49] regulator: ab8500-ext: Add support for AB9540 regulators Lee Jones
2013-02-06 10:53 ` [PATCH 30/49] regulator: ab8500: Add support for the ab8540 Lee Jones
2013-02-06 10:53 ` [PATCH 31/49] regulator: ab8500: Update voltage handling for fixed voltage regulators Lee Jones
2013-02-06 10:53 ` [PATCH 32/49] regulator: ab8500: Delete useless fixed_uV field Lee Jones
2013-02-06 10:53 ` [PATCH 33/49] regulator: ab8500: Use regulator_list_voltage_table() Lee Jones
2013-02-06 10:53 ` [PATCH 34/49] regulator: ab8500: Fix vsdio parameters for AB8540 based platforms Lee Jones
2013-02-06 10:53 ` [PATCH 35/49] regulator: ab8500: Correct regulator id values Lee Jones
2013-02-06 10:53 ` [PATCH 36/49] regulator: ab8500: Don't register external regulators on AB8505 Lee Jones
2013-02-06 10:53 ` [PATCH 37/49] regulator: ab8500: Add voltage selection for AUDIO and ANA " Lee Jones
2013-02-06 10:54 ` [PATCH 38/49] regulator: ab8500: Also check for AB8505 based platforms Lee Jones
2013-02-06 10:54 ` [PATCH 39/49] regulator: ab8500: Add new operations for Vaux3 Lee Jones
2013-02-06 10:54 ` [PATCH 40/49] regulator: ab8500: Default value on LDO USB to HP Lee Jones
2013-02-06 10:54 ` [PATCH 41/49] regulator: ab8500: Add mode operation for v-amic Lee Jones
2013-02-06 10:54 ` [PATCH 42/49] regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 Lee Jones
2013-02-06 10:54 ` [PATCH 43/49] regulator: ab8500-ext: Adapt regulator registration for newly changed API Lee Jones
2013-02-06 10:54 ` [PATCH 44/49] regulator: ab8500: Use a struct to select the good regulator configuration Lee Jones
2013-02-06 10:54 ` [PATCH 45/49] regulator: ab8500: Introduce aux5, aux6 regulators for AB8540 Lee Jones
2013-02-06 10:54 ` [PATCH 46/49] regulator: ab8500: Set enable enable_time in regulator_desc Lee Jones
2013-02-06 10:54 ` [PATCH 47/49] regulator: ab8500: Remove the need for a 'delay' property Lee Jones
2013-02-06 10:54 ` [PATCH 48/49] regulator: ab8500: Use regulator_list_voltage_table() to look-up voltages Lee Jones
2013-02-06 10:54 ` [PATCH 49/49] ARM: ux500: Pass regulator platform data using the new format Lee Jones
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=20130208105539.GF8879@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/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).