Samuel Ortiz [off-list ref] wrote:

Hi Dmitry,

On Tue, Jun 11, 2013 at 09:04:16AM -0700, Dmitry Torokhov wrote:

quoted

On Tue, Jun 11, 2013 at 04:23:58PM +0200, Samuel Ortiz wrote:

quoted

Hi Sebastian,

On Tue, Jun 11, 2013 at 01:30:46PM +0200, Sebastian Andrzej Siewior

wrote:

quoted

quoted

quoted

I believe the whole thing should go via the MFD tree. It touches

also

quoted

quoted

quoted

input & iio subsystem. I collected ACKs where I got some in the

meantime.

quoted

quoted

Please fix your commit logs, and your subject lines. It should be

e.g.

quoted

quoted

mfd: input: ti_am335x_adc: Blablabla

if it's mostly an mfd patch that also touches an input driver.

Then, this is a pretty big patchset, with iio, input and mfd all

mixed

quoted

quoted

together and it is likely to create merge conflicts.
From what I can see from it, and please correct me if I'm
wrong, the iio and input changes depend on the mfd ones, and not

the

quoted

quoted

other way around. If that's so, I'm going to ask you to reshuffle

your

quoted

quoted

patch set and separate the MFD changes from the iio and input ones.

I'll

quoted

quoted

take the MFD ones and will create an immutable branch for Jonathan

and

quoted

quoted

Dmitry to pull from and apply the iio and input changes on top of

it.

quoted

quoted

Merge conflicts should be mostly avoided that way.

I purposely left this driver alone as I expected it would be merged
through MFD tree, so there should not be any merging issues on my

side.
Thanks for the notice.
Jonathan, can you guarantee the same for the iio parts ?

I have also been avoiding taking any of these and there are unlikely to be any iio wide changes merging at this stage in cycle.  Hence these going through MFD is best plan.

Lars raised a couple of issues so would be best to wait for his ack if he hasn't already looked at this revision.

Thanks

Jonathan. 

Sabastian, hold on before reworking your patchset.

Cheers,
Samuel.

-- 
Sent from my Android phone with K-9 Mail. Please excuse my brevity.