Skip to contentSkip to conversation

regulator: First pull of MFD <-> Regulator IB (v3.16)

GIT PULL Lee Jones 2 participants 6 messages Apr 23, 2014 – Apr 29, 2014

lore
Share & tools
lore

Lee Jones

author
#0 lore raw

The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:

Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-regulator-3.16

for you to fetch changes up to 60e91b51b515b20f85697fcd397911fdb97bbdca:

regulator: tps65090: Allow setting the overcurrent wait time (2014-04-23 12:34:01 +0100)

----------------------------------------------------------------
Immutable branch between MFD and Regulator due for v3.16 merge-window.

----------------------------------------------------------------
Doug Anderson (3):
mfd: tps65090: Don't tell child devices we have an IRQ if we don't
mfd: tps65090: Stop caching most registers
regulator: tps65090: Allow setting the overcurrent wait time

 Documentation/devicetree/bindings/regulator/tps65090.txt |  4 ++++
 drivers/mfd/tps65090.c                                   | 41 +++++++++++++++++++++++++----------------
 drivers/power/tps65090-charger.c                         | 11 -----------
 drivers/regulator/tps65090-regulator.c                   | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/tps65090.h                             | 19 +++++++++++++++++++
 5 files changed, 104 insertions(+), 27 deletions(-)
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#1 lore raw
Quoted 4 lines · Lee Jones

Doug Anderson (3):
mfd: tps65090: Don't tell child devices we have an IRQ if we don't
mfd: tps65090: Stop caching most registers
regulator: tps65090: Allow setting the overcurrent wait time

Can you drop the last one please, I've already applied it? I'd have expected just the first two (or probably even just the second one). If you need it in your tree just grab the branch (or I can tag it if you like).

I tend to apply these things early where they don't have dependencies due to the large number of reposts for unrelated changes in the series that tend to happen (and often several very similar serieses being in flight at once); I frequently end up just deleting them unread. Not sure what the best way to handle this stuff is in general.

Quoted 6 lines
 Documentation/devicetree/bindings/regulator/tps65090.txt |  4 ++++
 drivers/mfd/tps65090.c                                   | 41 +++++++++++++++++++++++++----------------
 drivers/power/tps65090-charger.c                         | 11 -----------
 drivers/regulator/tps65090-regulator.c                   | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/tps65090.h                             | 19 +++++++++++++++++++
 5 files changed, 104 insertions(+), 27 deletions(-)

Your formatting for these still seems to be messing up.

author
#2 lore raw
Quoted 10 lines
Quoted 4 lines

Doug Anderson (3):
mfd: tps65090: Don't tell child devices we have an IRQ if we don't
mfd: tps65090: Stop caching most registers
regulator: tps65090: Allow setting the overcurrent wait time

Can you drop the last one please, I've already applied it? I'd have expected just the first two (or probably even just the second one). If you need it in your tree just grab the branch (or I can tag it if you like).

Quoted 5 lines

I tend to apply these things early where they don't have dependencies due to the large number of reposts for unrelated changes in the series that tend to happen (and often several very similar serieses being in flight at once); I frequently end up just deleting them unread. Not sure what the best way to handle this stuff is in general.

I know that you due, which I think makes things easier for you, but more difficult for everyone else (author, other maintainers). Applying cross-subsystem patches also makes things difficult down the line.

Not sure what do do about the last patch now, as it has MFD changes which aren't in the MFD tree. All well and good if no one else touches that hunk for the remainder of the cycle, but if they do we're likely to have merge conflicts.

I'll re-spin Monday.

Quoted 8 lines
Quoted 6 lines
 Documentation/devicetree/bindings/regulator/tps65090.txt |  4 ++++
 drivers/mfd/tps65090.c                                   | 41 +++++++++++++++++++++++++----------------
 drivers/power/tps65090-charger.c                         | 11 -----------
 drivers/regulator/tps65090-regulator.c                   | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/tps65090.h                             | 19 +++++++++++++++++++
 5 files changed, 104 insertions(+), 27 deletions(-)

Your formatting for these still seems to be messing up.

How so? Looks fine for me I think?

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw
Quoted 11 lines · Lee Jones
Quoted 10 lines

Can you drop the last one please, I've already applied it? I'd have expected just the first two (or probably even just the second one). If you need it in your tree just grab the branch (or I can tag it if you like).

I tend to apply these things early where they don't have dependencies due to the large number of reposts for unrelated changes in the series that tend to happen (and often several very similar serieses being in flight at once); I frequently end up just deleting them unread. Not sure what the best way to handle this stuff is in general.

Quoted 3 lines

I know that you due, which I think makes things easier for you, but more difficult for everyone else (author, other maintainers). Applying cross-subsystem patches also makes things difficult down the line.

It's not really my convenience here - it's about trying progress the serieses and cut the amount of code that people are having to carry.

People were complaining about things getting stalled due to lack of review but of course one of the reasons for that is that it seems that the early bits of the series commonly need respins and there's frequent delays too (probably compounded by the frequent respins). That creates a sense that these things are going nowhere slowly (or are just reposts of already reviewed changes) which discourages spending time on them until someone actively chases and then compounds the problem.

Quoted 4 lines

Not sure what do do about the last patch now, as it has MFD changes which aren't in the MFD tree. All well and good if no one else touches that hunk for the remainder of the cycle, but if they do we're likely to have merge conflicts.

As I said above just pull the branch into MFD - like I say I can tag it if you want, in fact I just pushed one:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tags/tps65090-reg-pdata-v3.16

That's what all the tiny topic branches are for, to make it easy to do merges when needed - there shouldn't be any great difficulty here?

Quoted 10 lines
Quoted 8 lines
Quoted 6 lines
 Documentation/devicetree/bindings/regulator/tps65090.txt |  4 ++++
 drivers/mfd/tps65090.c                                   | 41 +++++++++++++++++++++++++----------------
 drivers/power/tps65090-charger.c                         | 11 -----------
 drivers/regulator/tps65090-regulator.c                   | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/tps65090.h                             | 19 +++++++++++++++++++
 5 files changed, 104 insertions(+), 27 deletions(-)

Your formatting for these still seems to be messing up.

How so? Looks fine for me I think?

The lines are *way* over 80 columns, look to be formatted for about 130 or something.

author
#4 lore raw
In reply to Lee Jones

With the Regulator patch removed this time - as requested.

The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:

Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-regulator-3.16

for you to fetch changes up to c42ba72ec3a7a1b6aa30122931f1f4b91b601c31:

mfd: tps65090: Stop caching most registers (2014-04-23 12:32:19 +0100)

----------------------------------------------------------------
Immutable branch between MFD and Regulator due for v3.16 merge-window.

----------------------------------------------------------------
Doug Anderson (2):
mfd: tps65090: Don't tell child devices we have an IRQ if we don't
mfd: tps65090: Stop caching most registers

 drivers/mfd/tps65090.c           | 41 +++++++++++++++++++++++++----------------
 drivers/power/tps65090-charger.c | 11 -----------
 include/linux/mfd/tps65090.h     | 14 ++++++++++++++
 3 files changed, 39 insertions(+), 27 deletions(-)
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#5 lore raw
Quoted 10 lines · Lee Jones

With the Regulator patch removed this time - as requested.

The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:

Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-regulator-3.16

Quoted 8 lines

for you to fetch changes up to c42ba72ec3a7a1b6aa30122931f1f4b91b601c31:

mfd: tps65090: Stop caching most registers (2014-04-23 12:32:19 +0100)

----------------------------------------------------------------
Immutable branch between MFD and Regulator due for v3.16 merge-window.

----------------------------------------------------------------

Pulled, thanks.