tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile fixes from Chris Metcalf:
"These are a code cleanup and config cleanup, respectively"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: array underflow in setup_maxnodemem()
tile: defconfig: Cleanup from old Kconfig options

Linus Torvalds d21b8ea7 4d9af767

+1 -4
-1
arch/tile/configs/tilegx_defconfig
··· 409 409 CONFIG_CRYPTO_SERPENT=m 410 410 CONFIG_CRYPTO_TEA=m 411 411 CONFIG_CRYPTO_TWOFISH=m 412 - CONFIG_CRYPTO_ZLIB=m 413 412 CONFIG_CRYPTO_LZO=m
-2
arch/tile/configs/tilepro_defconfig
··· 189 189 CONFIG_IP_NF_MATCH_TTL=m 190 190 CONFIG_IP_NF_FILTER=y 191 191 CONFIG_IP_NF_TARGET_REJECT=y 192 - CONFIG_IP_NF_TARGET_ULOG=m 193 192 CONFIG_IP_NF_MANGLE=m 194 193 CONFIG_IP_NF_TARGET_ECN=m 195 194 CONFIG_IP_NF_TARGET_TTL=m ··· 520 521 CONFIG_CRYPTO_SERPENT=m 521 522 CONFIG_CRYPTO_TEA=m 522 523 CONFIG_CRYPTO_TWOFISH=m 523 - CONFIG_CRYPTO_ZLIB=m 524 524 CONFIG_CRYPTO_LZO=m 525 525 CONFIG_CRC_CCITT=m 526 526 CONFIG_CRC7=m
+1 -1
arch/tile/kernel/setup.c
··· 140 140 { 141 141 char *endp; 142 142 unsigned long long maxnodemem; 143 - long node; 143 + unsigned long node; 144 144 145 145 node = str ? simple_strtoul(str, &endp, 0) : INT_MAX; 146 146 if (node >= MAX_NUMNODES || *endp != ':')