linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com,
	peterz@infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org, arnd@arndb.de, jengelh@medozas.de
Subject: Re: linux-next: manual merge of the tip tree with the net tree
Date: Wed, 12 Aug 2009 17:33:25 -0700 (PDT)	[thread overview]
Message-ID: <20090812.173325.255498124.davem@davemloft.net> (raw)
In-Reply-To: <20090807164705.725869c1.sfr@canb.auug.org.au>

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Aug 2009 16:47:05 +1000

> Today's linux-next merge of the tip tree got a conflict in
> arch/x86/include/asm/socket.h between commits
> 49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL
> getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net:
> implement a SO_DOMAIN getsockoption") from the net tree and commit
> 73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate
> header files") from the tip tree.
> 
> The latter change supercedes the former ones, so I used the latter.

That should be the correct merge resolution, thanks!

  reply	other threads:[~2009-08-13  0:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-07  6:47 linux-next: manual merge of the tip tree with the net tree Stephen Rothwell
2009-08-13  0:33 ` David Miller [this message]
2009-08-13  4:04   ` Stephen Rothwell
2010-06-21  6:16 Stephen Rothwell
2010-06-21 17:30 ` Paul E. McKenney
2010-06-21 23:42   ` Stephen Rothwell
2010-09-13  2:37 Stephen Rothwell
2019-10-11  0:52 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=20090812.173325.255498124.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=arnd@arndb.de \
    --cc=hpa@zytor.com \
    --cc=jengelh@medozas.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /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).