This BitKeeper patch contains the following changesets: 1.1166 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: jfbeam # Host: troz.com # Root: /usr/src/linux-2.6-bk # #--- 1.5/lib/Kconfig Thu Jun 19 13:06:56 2003 #+++ 1.6/lib/Kconfig Sun Sep 7 04:33:24 2003 #@@ -18,7 +18,7 @@ # config ZLIB_INFLATE # tristate # default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y || CRYPTO_DEFLATE=y #- default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m || CRYPTO_DEFLATE=m #+ default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || CRYPTO_DEFLATE=m # # config ZLIB_DEFLATE # tristate # # Diff checksum=609c8d10 # Patch vers: 1.3 # Patch type: REGULAR == ChangeSet == torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864 jfbeam@troz.com|ChangeSet|20030906022556|09834 D 1.1166 03/09/07 04:33:43-04:00 jfbeam@troz.com +1 -0 B torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864 C c [PATCH] BINFMT_ZFLAT cannot be 'm' K 9961 P ChangeSet ------------------------------------------------ 0a0 > zippel@linux-m68k.org[torvalds]|lib/Kconfig|20021030043238|32449|725b16112982a2ee jfbeam@troz.com|lib/Kconfig|20030907083324|65451 == lib/Kconfig == zippel@linux-m68k.org[torvalds]|lib/Kconfig|20021030043238|32449|725b16112982a2ee greg@kroah.com|lib/Kconfig|20030619170656|01325 D 1.6 03/09/07 04:33:24-04:00 jfbeam@troz.com +1 -1 B torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864 C c BINFMT_ZFLAT is bool K 65451 O -rw-rw-r-- P lib/Kconfig ------------------------------------------------ D21 1 I21 1 default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || CRYPTO_DEFLATE=m # Patch checksum=98a32c8b