LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Matthew Wilcox <matthew@wil.cx>
Subject: Re: linux-next: Tree for March 5
Date: Thu, 6 Mar 2008 10:13:20 +1100	[thread overview]
Message-ID: <20080306101320.80320085.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080305.145520.241264097.davem@davemloft.net>

[-- Attachment #1: Type: text/plain, Size: 907 bytes --]

Hi Dave,

On Wed, 05 Mar 2008 14:55:20 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> Feel free to start pulling in:
> 
> git://git.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.26.git#master

Added, thanks.

> I just did a test pull into the current linux-next.
> 
> There was one conflict, net/tipc/socket.c, which has been converted
> from semaphores to mutexes.  It conflicts with the generic semaphores
> change, and essentially you can simply remove the generic semaphore
> modifications to this file when you build the next tree since the
> net-2.6.26 tree changes these TIPC bits to not use semaphores any
> more.
> 
> The result builds cleanly allmodconfig on sparc64.

Thanks for testing.  I have put this tree ahead of the semaphore tree so
that the pain will fall appropriately :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

  reply	other threads:[~2008-03-05 23:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-05  9:47 linux-next: Tree for March 5 Stephen Rothwell
2008-03-05 22:55 ` David Miller
2008-03-05 23:13   ` Stephen Rothwell [this message]
2009-03-05  8:50 Stephen Rothwell
2010-03-05  7:13 Stephen Rothwell

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=20080306101320.80320085.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=matthew@wil.cx \
    /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;
as well as URLs for NNTP newsgroup(s).