linux-kernel - linux-next: manual merge of the staging tree with the kbuild tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 27 Nov 2014 19:05:08 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Michal Marek <mmarek@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Boaz Harrosh <boaz@...xistor.com>,
	Benjamin Romer <benjamin.romer@...sys.com>
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@...b.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

Content of type "application/pgp-signature" skipped