From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Michal Marek <mmarek@suse.cz>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boaz Harrosh <boaz@plexistor.com>,
Benjamin Romer <benjamin.romer@unisys.com>
Subject: linux-next: manual merge of the staging tree with the kbuild tree
Date: Thu, 27 Nov 2014 19:05:08 +1100 [thread overview]
Message-ID: <20141127190508.3305dfe8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 721 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict
in .gitignore between commit dfe0487249e5 (".gitignore: Add Kdevelop4
project files") from the kbuild tree and commit 75185f57f110 ("staging:
unisys: fix CamelCase macro names in controlframework.h") from the
staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc .gitignore
index ce57b79670a5,6bfac06d79ca..000000000000
--- a/.gitignore
+++ b/.gitignore
@@@ -97,5 -97,6 +97,9 @@@ x509.genke
# Kconfig presets
all.config
+# Kdevelop4
+*.kdev4
++
+ #eclipse files
+ .project
+ .cproject
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-27 8:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 8:05 Stephen Rothwell [this message]
2014-11-27 8:24 ` Boaz Harrosh
2014-11-27 15:11 ` Greg KH
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=20141127190508.3305dfe8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benjamin.romer@unisys.com \
--cc=boaz@plexistor.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mmarek@suse.cz \
/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
all inboxes | Powered by JetHome®