From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: linux-next: manual merge of the tip tree with the drm tree
Date: Fri, 17 Feb 2017 12:56:29 +1100 [thread overview]
Message-ID: <20170217125629.28d43302@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/kref.h
between commit:
56e3d1cd05cc ("kref: prefer atomic_inc_not_zero to atomic_add_unless")
from the drm tree and commit:
10383aea2f44 ("kref: Implement 'struct kref' using refcount_t")
from the tip tree.
I fixed it up (I just used the tip tree version of kref_get_unless_zero())
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-02-17 1:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 1:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-11 3:59 linux-next: manual merge of the tip tree with the drm tree Stephen Rothwell
2019-11-27 0:18 Stephen Rothwell
2019-10-10 1:51 Stephen Rothwell
2019-11-27 23:36 ` Stephen Rothwell
2017-02-01 3:38 Stephen Rothwell
2016-11-17 2:59 Stephen Rothwell
2016-03-17 2:00 Stephen Rothwell
2016-03-17 9:00 ` Arnd Bergmann
2016-03-17 9:39 ` Stephen Rothwell
2016-03-17 16:52 ` Dave Hansen
2014-03-24 3:38 Stephen Rothwell
2012-03-13 5:11 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=20170217125629.28d43302@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jason@zx2c4.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--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).