* linux-next: manual merge of the staging tree with the kbuild tree
@ 2014-11-27 8:05 Stephen Rothwell
2014-11-27 8:24 ` Boaz Harrosh
2014-11-27 15:11 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-11-27 8:05 UTC (permalink / raw)
To: Greg KH, Michal Marek
Cc: linux-next, linux-kernel, Boaz Harrosh, Benjamin Romer
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the staging tree with the kbuild tree
2014-11-27 8:05 linux-next: manual merge of the staging tree with the kbuild tree Stephen Rothwell
@ 2014-11-27 8:24 ` Boaz Harrosh
2014-11-27 15:11 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Boaz Harrosh @ 2014-11-27 8:24 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH, Michal Marek
Cc: linux-next, linux-kernel, Benjamin Romer
> 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.
>
Hi Greg Michal
I suggest to unify the two like:
+# IDE project files
+*.kdev4
+.project
+.cproject
And put the one patch from one tree. There is no need to
comment about every IDE out there, just the one section for
them all, I think
Tell me if you guys need a patch and/or which tree should take
it?
Thanks
Boaz
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the staging tree with the kbuild tree
2014-11-27 8:05 linux-next: manual merge of the staging tree with the kbuild tree Stephen Rothwell
2014-11-27 8:24 ` Boaz Harrosh
@ 2014-11-27 15:11 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2014-11-27 15:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michal Marek, linux-next, linux-kernel, Boaz Harrosh, Benjamin Romer
On Thu, Nov 27, 2014 at 07:05:08PM +1100, Stephen Rothwell wrote:
> 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
Woah, I missed that this patch in the staging tree added to the
.gitignore file, that's not ok, sorry about that, I'll go rip this patch
out of my tree.
Benjamin, please be more careful.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-27 15:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-27 8:05 linux-next: manual merge of the staging tree with the kbuild tree Stephen Rothwell
2014-11-27 8:24 ` Boaz Harrosh
2014-11-27 15:11 ` Greg KH
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).