LKML Archive on
help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Matthew Wilcox <>
Cc:, LKML <>,
	Haavard Skinnemoen <>,
	Greg KH <>, Mark Fasheh <>
Subject: linux-next: semaphore update merge conflicts
Date: Fri, 29 Feb 2008 15:39:58 +1100	[thread overview]
Message-ID: <> (raw)

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

Hi Willy,

Not as bad as I thought it might be!  :-)

The merge had the following conflicts:

		Conflicts with the ocfs2 tree - trivial to fix.
		the avr32 tree appeared to just change spaces to tabs
		in this file so I removed it (as your changes did).
		the driver-core changed the semaphore in here to a mutex,
		so the change from asm/semaphore.h to linux/semaphore.h
		is no longer needed.

Stephen Rothwell          

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

             reply	other threads:[~2008-02-29  4:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-29  4:39 Stephen Rothwell [this message]
2008-02-29 10:17 ` Haavard Skinnemoen
2008-02-29 12:17   ` Stephen Rothwell
2008-02-29 12:25     ` Haavard Skinnemoen
2008-02-29 12:30       ` 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \
    --subject='Re: linux-next: semaphore update merge conflicts' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).