From: Mark Brown <broonie@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Tony Lindgren <tony@atomide.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
kernel-build-reports@lists.linaro.org,
linaro-kernel@lists.linaro.org, linux-next@vger.kernel.org,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: next-20150604 build: 2 failures 37 warnings (next-20150604)
Date: Fri, 5 Jun 2015 18:16:52 +0100 [thread overview]
Message-ID: <20150605171652.GB14071@sirena.org.uk> (raw)
In-Reply-To: <20150605104900.GA5346@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
On Fri, Jun 05, 2015 at 07:49:00PM +0900, Greg Kroah-Hartman wrote:
> On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote:
> > Greg, there's now commit 9809889c708e in tty-linus and commit
> > 9e91597f2423 in tty-next.
> Yes, I can't go back and remove the one in tty-next, I'm guessing when
> they are merged there is an issue. I'll look into that after Linus
> pulls in my tty-linus tree.
Yeah, git isn't always spectacularly good at resolving add/add if
there's context changes between two things in a merge - it sometimes
ends up double adding things.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
next prev parent reply other threads:[~2015-06-05 17:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1Z0YIL-0008Ma-5O@optimist>
2015-06-04 17:01 ` next-20150604 build: 2 failures 37 warnings (next-20150604) Mark Brown
2015-06-04 17:10 ` Tony Lindgren
2015-06-04 17:20 ` Tony Lindgren
2015-06-04 17:57 ` Mark Brown
2015-06-05 10:49 ` Greg Kroah-Hartman
2015-06-05 17:16 ` Mark Brown [this message]
2015-06-08 20:56 ` Greg Kroah-Hartman
2015-06-10 7:04 ` 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=20150605171652.GB14071@sirena.org.uk \
--to=broonie@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-build-reports@lists.linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox