public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 0/2 v2] Renesas sh-sci updates for v3.11
Date: Mon, 17 Jun 2013 17:59:47 +0900	[thread overview]
Message-ID: <20130617085947.GA3083@verge.net.au> (raw)
In-Reply-To: <1371440327-30512-1-git-send-email-horms+renesas@verge.net.au>

Sorry, please ignore this, I realised that I have made an error when
applying the second patch.

On Mon, Jun 17, 2013 at 12:38:45PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> As requested the first patch is now includes an ack from Greg Kroah-Hartman.
> 
> I have included the r8a7790 change in this patch as it
> depends on the first change in the pull-request but nothing else.
> 
> This pull request will cause some conflicts though I believe all
> of them are not difficult to resolve. The renesas-next-20130613 tag in
> my tree illustrates how I have handled the conflicts with
> both changes already in arm-soc and changes I intend to send
> pull requests for in the near future.
> 
> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
> 
>   Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci-for-v3.11
> 
> for you to fetch changes up to fe0b1091e41e0acae8ddf2da2a5a36b6867ff012:
> 
>   ARM: shmobile: r8a7790: don't use external clock for SCIFs (2013-06-17 12:17:48 +0900)
> 
> ----------------------------------------------------------------
> Renesas sh-sci updates for v3.11
> 
> HSCIF support by Ulrich Hecht.
> 
> ----------------------------------------------------------------
> Ulrich Hecht (2):
>       serial: sh-sci: HSCIF support
>       ARM: shmobile: r8a7790: don't use external clock for SCIFs
> 
>  arch/arm/mach-shmobile/setup-r8a7790.c |   16 ++++-
>  drivers/tty/serial/sh-sci.c            |  102 +++++++++++++++++++++++++++++---
>  include/linux/serial_sci.h             |   12 +++-
>  include/uapi/linux/serial_core.h       |    3 +
>  4 files changed, 120 insertions(+), 13 deletions(-)
> 

      parent reply	other threads:[~2013-06-17  8:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-17  3:38 [GIT PULL 0/2 v2] Renesas sh-sci updates for v3.11 Simon Horman
2013-06-17  3:38 ` [PATCH 1/2] serial: sh-sci: HSCIF support Simon Horman
2013-06-17 12:54   ` Arnd Bergmann
2013-06-18  1:19     ` Simon Horman
2013-06-19  8:46       ` Ulrich Hecht
2013-06-19 12:33         ` Simon Horman
2013-06-19 15:08           ` Arnd Bergmann
2013-06-20 12:08             ` Simon Horman
2013-06-17  3:38 ` [PATCH 2/2] ARM: shmobile: r8a7790: don't use external clock for SCIFs Simon Horman
2013-06-17  8:59 ` Simon Horman [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=20130617085947.GA3083@verge.net.au \
    --to=horms@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.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