zygo: reset to 3.3.5 w/config from 3.2.13

(cherry picked from commit 0c265d3fc7853aff905b04fe9737cc7909933351)
(cherry picked from commit 0a0423cc33d845653d1717d407b298feb38b8cef)
(cherry picked from commit bfa6f0aefc0333d3319192b7e9030505d90842ad)
(cherry picked from commit 408afd4fc4123306cfbf59586a48dec1141926e3)
(cherry picked from commit 0190c5fa5141410cce333b092ff8cb7b0c077833)

Conflicts:

	.config

diff --git a/.gitignore b/.gitignore
index 57af07cf7e682e77de69d96587b0ca315ea611a1..f64bad16c2d4f9b1aa89ede02d93f2e27e709732 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -84,3 +84,28 @@ GTAGS
 *.orig
 *~
 \#*#
+*.rej
+
+# Debian's kernel-package
+debian
+scripts/package/Makefile.kpkg-dist
+scripts/package/builddeb.kpkg-dist
+stamp-debian
+conf.vars
+stamp-arch-build
+stamp-arch-conf
+stamp-binary-indep
+stamp-indep-bin
+stamp-indep-build
+stamp-indep-conf
+stamp-indep-inst
+stamp-arch-bin
+stamp-arch-inst
+stamp-binary
+stamp-binary-arch
+
+# Zygo's 'do' script
+make.log
+
+# Zygo wants to track .config too
+!.config

diff --git a/Makefile b/Makefile
index 64615e9399fa3cd3a56886cdd32d213ab77ad91b..6f89ff8af4844970458131953cdfb5a8adf1722f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ SUBLEVEL = 5
 EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 
+EXTRAVERSION := $(EXTRAVERSION)-zb64
+
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
 # More info can be located in ./README