Messages in this thread | | | Date | Thu, 27 Nov 2014 19:05:08 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the kbuild tree |
| |
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 [unhandled content-type:application/pgp-signature] | |