From: Greg KH <gregkh@linuxfoundation.org>
To: Felipe Balbi <balbi@ti.com>
Cc: linux-serial@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2] serial: omap: fix compile breakage
Date: Fri, 7 Sep 2012 08:31:36 -0700 [thread overview]
Message-ID: <20120907153136.GA8634@kroah.com> (raw)
In-Reply-To: <1346995531-3197-1-git-send-email-balbi@ti.com>
On Fri, Sep 07, 2012 at 08:25:31AM +0300, Felipe Balbi wrote:
> when rebasing patches on top of Greg's tty-next,
> it looks like automerge broke a few things which
> I didn't catch (for whatever reason I didn't
> have OMAP Serial enabled on .config) so I ended
> up breaking the build on Greg's tty-next branch.
>
> Fix the breakage by re-adding the three missing
> members on struct uart_omap_port.
>
> Reported-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>
> Changes since v1:
> . remove the fields from <plat/omap-serial.h>
>
> arch/arm/plat-omap/include/plat/omap-serial.h | 4 ----
> drivers/tty/serial/omap-serial.c | 4 ++++
> 2 files changed, 4 insertions(+), 4 deletions(-)
This applies with fuzz, what tree did you make it against?
patching file arch/arm/plat-omap/include/plat/omap-serial.h
Hunk #1 succeeded at 105 with fuzz 1 (offset 26 lines).
patching file drivers/tty/serial/omap-serial.c
Hunk #1 succeeded at 100 (offset -23 lines).
Should I still apply it?
greg k-h
WARNING: multiple messages have this Message-ID (diff)
From: gregkh@linuxfoundation.org (Greg KH)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] serial: omap: fix compile breakage
Date: Fri, 7 Sep 2012 08:31:36 -0700 [thread overview]
Message-ID: <20120907153136.GA8634@kroah.com> (raw)
In-Reply-To: <1346995531-3197-1-git-send-email-balbi@ti.com>
On Fri, Sep 07, 2012 at 08:25:31AM +0300, Felipe Balbi wrote:
> when rebasing patches on top of Greg's tty-next,
> it looks like automerge broke a few things which
> I didn't catch (for whatever reason I didn't
> have OMAP Serial enabled on .config) so I ended
> up breaking the build on Greg's tty-next branch.
>
> Fix the breakage by re-adding the three missing
> members on struct uart_omap_port.
>
> Reported-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>
> Changes since v1:
> . remove the fields from <plat/omap-serial.h>
>
> arch/arm/plat-omap/include/plat/omap-serial.h | 4 ----
> drivers/tty/serial/omap-serial.c | 4 ++++
> 2 files changed, 4 insertions(+), 4 deletions(-)
This applies with fuzz, what tree did you make it against?
patching file arch/arm/plat-omap/include/plat/omap-serial.h
Hunk #1 succeeded at 105 with fuzz 1 (offset 26 lines).
patching file drivers/tty/serial/omap-serial.c
Hunk #1 succeeded at 100 (offset -23 lines).
Should I still apply it?
greg k-h
next prev parent reply other threads:[~2012-09-07 15:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 5:21 [PATCH] serial: omap: fix compile breakage Felipe Balbi
2012-09-07 5:21 ` Felipe Balbi
2012-09-07 5:25 ` [PATCH v2] " Felipe Balbi
2012-09-07 5:25 ` Felipe Balbi
2012-09-07 15:31 ` Greg KH [this message]
2012-09-07 15:31 ` Greg KH
2012-09-07 15:34 ` [PATCH] " Felipe Balbi
2012-09-07 15:34 ` Felipe Balbi
2012-09-07 15:40 ` Greg KH
2012-09-07 15:40 ` Greg KH
2012-09-07 17:57 ` Tony Lindgren
2012-09-07 17:57 ` Tony Lindgren
2012-09-07 18:10 ` [PATCH] serial: omap: fix DeviceTree boot Felipe Balbi
2012-09-07 18:10 ` Felipe Balbi
2012-09-07 18:26 ` Tony Lindgren
2012-09-07 18:26 ` Tony Lindgren
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=20120907153136.GA8634@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.