[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <a55d774e0906181229t5d71622dh5e7403218b88a4b6@mail.gmail.com>
Date: Thu, 18 Jun 2009 12:29:44 -0700
From: Brian Swetland <swetland@...gle.com>
To: Alan Cox <alan@...rguk.ukuu.org.uk>
Cc: linux-arm-kernel@...ts.arm.linux.org.uk,
linux-kernel@...r.kernel.org, pavel@....cz,
Robert Love <rlove@...gle.com>
Subject: Re: [PATCH 1/3] [ARM] msm_serial: serial driver for MSM7K onboard
serial peripheral.
On Thu, Jun 18, 2009 at 2:20 AM, Alan Cox<alan@...rguk.ukuu.org.uk> wrote:
> On Wed, 17 Jun 2009 17:31:13 -0700
> Brian Swetland <swetland@...gle.com> wrote:
>
>> From: Robert Love <rlove@...gle.com>
>>
>> Provides support for the "lowspeed" UARTs on the MSM7k and QSD8k
>> family of SoCs from Qualcomm. Serial console support included.
>>
>> Signed-off-by: Robert Love <rlove@...gle.com>
>> Signed-off-by: Brian Swetland <swetland@...gle.com>
>> Acked-by: Pavel Machek <pavel@....cz>
>
> If you fold other peoples patches into something please preserve the
> authorship data and preferably keep the two patches separated as it
> otherwise causes merge problems if stuff (eg the serial patches) goes via
> two trees at once.
Ah, sorry about that -- I can resend the revised patch that your patch
applies against (but without your changes merged in). Previously, for
the ARM stuff I got the impression that a single patch folding small
changes in was preferred, but I may have misunderstood the workflow.
> At the moment the ttydev tree has
> -> your original -> my (intel's I guess) fixes ->
>
> and if the updated one also went in via the arm tree git can't always
> figure out what is going on.
>
> If its only going by one path and you know that then just adding an
> additional note on the authorship of updates is fine but this being
> serial/tty and ARM is likely to hit both trees.
>
> Alan
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists