From: NeilBrown <neilb@suse.de>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Thierry Reding <thierry.reding@gmail.com>,
Shaohua Li <shli@kernel.org>, Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the tip tree
Date: Thu, 17 Oct 2013 07:31:00 +1100 [thread overview]
Message-ID: <20131017073100.2cab1ffa@notabene.brown> (raw)
In-Reply-To: <20131016201410.GA26785@twins.programming.kicks-ass.net>
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
On Wed, 16 Oct 2013 22:14:10 +0200 Peter Zijlstra <peterz@infradead.org>
wrote:
> On Wed, Oct 16, 2013 at 10:06:45PM +0200, Peter Zijlstra wrote:
> > On Wed, Oct 16, 2013 at 08:51:39PM +0200, Thierry Reding wrote:
> > > Today's linux-next merge of the tip tree got a conflict in
> > >
> > > include/linux/wait.h
> > >
> > > caused by commits 1ab2460 (wait: add wait_event_cmd()) and fb869b6
> > > (sched/wait: Clean up wait.h details a bit).
> >
> > Gargh, where did that come from?!
>
> Also, wth does that live?
>
>
> # git show 1ab2460
> fatal: ambiguous argument '1ab2460': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions, like this:
> 'git <command> [<revision>...] -- [<file>...]'
> # git remote show next
> * remote next
> Fetch URL: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>
> And I made sure to update the remote.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
It seems to have moved to
git://gitorious.org/thierryreding/linux-next.git
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next prev parent reply other threads:[~2013-10-16 20:31 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 18:51 linux-next: Tree for Oct 16 Thierry Reding
2013-10-16 18:51 ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-16 20:06 ` Peter Zijlstra
2013-10-16 20:14 ` Peter Zijlstra
2013-10-16 20:31 ` NeilBrown [this message]
2013-10-16 20:35 ` Peter Zijlstra
2013-10-16 20:51 ` Thierry Reding
2013-10-16 21:00 ` Peter Zijlstra
2013-10-16 20:52 ` Peter Zijlstra
2013-10-17 1:28 ` NeilBrown
2013-10-17 9:23 ` Peter Zijlstra
2013-10-22 2:09 ` NeilBrown
2013-10-16 20:40 ` Thierry Reding
2013-10-16 20:44 ` Thierry Reding
2013-10-16 21:30 ` Peter Zijlstra
2013-10-17 1:29 ` NeilBrown
2013-10-16 18:51 ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-16 18:58 ` Marc Zyngier
2013-10-16 19:02 ` Christoffer Dall
2013-10-16 19:04 ` Thierry Reding
2013-10-16 19:09 ` Christoffer Dall
2013-10-17 14:55 ` Gleb Natapov
2013-10-17 16:53 ` Christoffer Dall
2013-10-16 21:48 ` linux-next: Tree for Oct 16 (net/sched/em_ipset.c) Randy Dunlap
2013-10-16 22:39 ` Stephen Hemminger
2013-10-17 0:21 ` Randy Dunlap
2013-10-17 0:29 ` [PATCH net-next] em_ipset: use dev_net() accessor Stephen Hemminger
2013-10-18 20:23 ` David Miller
2013-10-17 0:58 ` linux-next: Tree for Oct 16 Randy Dunlap
2013-10-17 5:12 ` Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-25 13:25 ` Will Deacon
2013-10-26 8:40 ` Ingo Molnar
2013-10-26 14:01 ` Will Deacon
2013-10-27 7:12 ` Ingo Molnar
2013-10-27 10:00 ` Russell King - ARM Linux
2013-10-28 7:47 ` Thierry Reding
2013-10-28 8:45 ` Russell King - ARM Linux
2013-10-17 21:23 Mark Brown
2013-10-17 21:50 ` Cyrill Gorcunov
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the tip tree Thierry Reding
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=20131017073100.2cab1ffa@notabene.brown \
--to=neilb@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=shli@kernel.org \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.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.