From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Leon Romanovsky <leon@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Doug Ledford <dledford@redhat•com>
Subject: linux-next: manual merge of the rdma-leon tree with Linus' tree
Date: Mon, 13 Feb 2017 10:30:29 +1100 [thread overview]
Message-ID: <20170213103029.60176142@canb.auug.org.au> (raw)
Hi Leon,
Today's linux-next merge of the rdma-leon tree got a conflict in:
include/uapi/rdma/ib_user_verbs.h
between commit:
646ebd4166ca ("RDMA: Don't reference kernel private header from UAPI header")
from Linus' tree and commit:
39bfb78f4acb ("RDMA: Remove kernel private defines and reference to header from UAPI")
from the rdma-leon tree.
More or less the same patch.
I fixed it up (I used the version from Linus' tree (as it contains
explanatory comments)) 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
reply other threads:[~2017-02-12 23:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20170213103029.60176142@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dledford@redhat$(echo .)com \
--cc=leon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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