From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Shubhrajyoti D <shubhrajyoti@ti•com>,
Russell King <rmk@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the tty tree with the arm tree
Date: Tue, 6 Nov 2012 09:17:49 +0100 [thread overview]
Message-ID: <20121106081749.GB24564@kroah.com> (raw)
In-Reply-To: <20121106145332.5fd40abf0d74f8239156f75e@canb.auug.org.au>
On Tue, Nov 06, 2012 at 02:53:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/omap-serial.c between commit d864c03bfce2 ("SERIAL:
> omap: remove setting of EFR SCD bit") from the arm tree and commit
> 7ba897d77ce2 ("serial: omap: Remove the default setting of special
> character") from the tty tree.
>
> I fixed it up (using the version from the arm tree) and can carry the fix
> as necessary (no action is required).
That sounds fine, thanks.
greg k-h
prev parent reply other threads:[~2012-11-06 8:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-06 3:53 linux-next: manual merge of the tty tree with the arm tree Stephen Rothwell
2012-11-06 8:17 ` Greg KH [this message]
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=20121106081749.GB24564@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shubhrajyoti@ti$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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