From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Marshall <hubcap@omnibond•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the orangefs tree with Linus' tree
Date: Mon, 21 Dec 2015 10:31:06 +1100 [thread overview]
Message-ID: <20151221103106.7d3b9e85@canb.auug.org.au> (raw)
Hi Mike,
Today's linux-next merge of the orangefs tree got a conflict in:
Makefile
between commit:
1ec218373b8e ("Linux 4.4-rc2")
from Linus' tree and commit:
575e946125f7 ("Orangefs: change pvfs2 filenames to orangefs")
from the orangefs tree.
You should really remove this EXTRAVERSION change from the patch.
I fixed it up (I use Linus' tree verison) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-12-20 23:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-20 23:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-09 0:52 linux-next: manual merge of the orangefs tree with Linus' tree Stephen Rothwell
2020-04-09 15:05 ` Mike Marshall
2020-04-09 15:39 ` Jonathan Corbet
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=20151221103106.7d3b9e85@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hubcap@omnibond$(echo .)com \
--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