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
| ||
|
Date: Tue, 12 Jan 2010 11:25:16 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Phillip Lougher <phillip@...gher.demon.co.uk> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Randy Dunlap <randy.dunlap@...cle.com>, Albin Tonnerre <albin.tonnerre@...e-electrons.com> Subject: linux-next: manual merge of the squashfs tree with Linus' tree Hi Phillip, Today's linux-next merge of the squashfs tree got conflicts in lib/Kconfig and lib/Makefile between commit cacb246f8db2b9eba89d44a0f0dd4f6ed93bc113 ("Add LZO compression support for initramfs and old-style initrd") from Linus' tree and commits 2b817d5acc7a39c503d1393eb9e8268b39b5aa44 ("lzma: Make lzma available to non initramfs/initrd code") and 58f168eba2ff08f04323544eb7aaa2de10d39c2f ("ibs: force lzma_wrapper to be retained") from the squashfs tree. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc lib/Kconfig index 170d8ca,551d75d..0000000 --- a/lib/Kconfig +++ b/lib/Kconfig @@@ -117,10 -117,9 +117,13 @@@ config DECOMPRESS_BZIP config DECOMPRESS_LZMA tristate + config DECOMPRESS_LZMA_NEEDED + boolean + +config DECOMPRESS_LZO + select LZO_DECOMPRESS + tristate + # # Generic allocator support is selected if needed # diff --cc lib/Makefile index e02765d,4309e69..0000000 --- a/lib/Makefile +++ b/lib/Makefile @@@ -69,8 -68,7 +69,8 @@@ obj-$(CONFIG_LZO_DECOMPRESS) += lzo lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o - lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o + obj-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o +lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o obj-$(CONFIG_TEXTSEARCH) += textsearch.o obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists