From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Mon, 17 Jun 2013 08:59:47 +0000 Subject: Re: [GIT PULL 0/2 v2] Renesas sh-sci updates for v3.11 Message-Id: <20130617085947.GA3083@verge.net.au> List-Id: References: <1371440327-30512-1-git-send-email-horms+renesas@verge.net.au> In-Reply-To: <1371440327-30512-1-git-send-email-horms+renesas@verge.net.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org 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(-) > From mboxrd@z Thu Jan 1 00:00:00 1970 From: horms@verge.net.au (Simon Horman) Date: Mon, 17 Jun 2013 17:59:47 +0900 Subject: [GIT PULL 0/2 v2] Renesas sh-sci updates for v3.11 In-Reply-To: <1371440327-30512-1-git-send-email-horms+renesas@verge.net.au> References: <1371440327-30512-1-git-send-email-horms+renesas@verge.net.au> Message-ID: <20130617085947.GA3083@verge.net.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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(-) >