Commit e4aadb5d authored by Nolan's avatar Nolan

Update kernel to 4.14.136

This fixes the kernel build on Debian buster hosts.
parent 7bd20155
......@@ -14,7 +14,7 @@ SHELL=/bin/bash #tarfile signature checking uses process redirection.
DEBIAN_RELEASE := stretch
KERNEL_VERSION = 4.14.30
KERNEL_VERSION = 4.14.136
UBOOT_VERSION = 2017.11
BOOTFW_VERSION = 1.20170811
BUSYBOX_VERSION = 1.28.0-uclibc
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.14.30 Kernel Configuration
# Linux/x86 4.14.136 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
......@@ -255,6 +255,7 @@ CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_CRASH_CORE=y
CONFIG_KEXEC_CORE=y
CONFIG_HOTPLUG_SMT=y
# CONFIG_OPROFILE is not set
CONFIG_HAVE_OPROFILE=y
CONFIG_OPROFILE_NMI_TIMER=y
......@@ -291,6 +292,7 @@ CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_RCU_TABLE_FREE=y
CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
CONFIG_HAVE_CMPXCHG_LOCAL=y
......@@ -2300,6 +2302,7 @@ CONFIG_SERIAL_NONSTANDARD=y
# CONFIG_N_HDLC is not set
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
CONFIG_LDISC_AUTOLOAD=y
CONFIG_DEVMEM=y
# CONFIG_DEVKMEM is not set
......@@ -2356,7 +2359,6 @@ CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_VIA=y
# CONFIG_HW_RANDOM_VIRTIO is not set
CONFIG_NVRAM=y
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
#
......@@ -2724,7 +2726,6 @@ CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
#
# Watchdog Pretimeout Governors
#
# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_SSB_POSSIBLE=y
#
......@@ -4428,7 +4429,6 @@ CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_SALSA20 is not set
# CONFIG_CRYPTO_SALSA20_X86_64 is not set
# CONFIG_CRYPTO_CHACHA20 is not set
# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
# CONFIG_CRYPTO_SEED is not set
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.14.30 Kernel Configuration
# Linux/arm64 4.14.136 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
......@@ -424,6 +424,7 @@ CONFIG_ARM64_ERRATUM_819472=y
CONFIG_ARM64_ERRATUM_832075=y
CONFIG_ARM64_ERRATUM_845719=y
CONFIG_ARM64_ERRATUM_843419=y
CONFIG_ARM64_ERRATUM_1024718=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y
......@@ -522,6 +523,7 @@ CONFIG_XEN=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_ARM64_SSBD=y
# CONFIG_ARMV8_DEPRECATED is not set
# CONFIG_ARM64_SW_TTBR0_PAN is not set
......@@ -1458,6 +1460,7 @@ CONFIG_NET_CORE=y
CONFIG_MACVLAN=m
CONFIG_MACVTAP=m
# CONFIG_VXLAN is not set
# CONFIG_GTP is not set
# CONFIG_MACSEC is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
......@@ -1809,6 +1812,7 @@ CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
CONFIG_LDISC_AUTOLOAD=y
CONFIG_DEVMEM=y
#
......@@ -1896,7 +1900,6 @@ CONFIG_HW_RANDOM_MSM=m
CONFIG_HW_RANDOM_XGENE=m
CONFIG_HW_RANDOM_MESON=m
CONFIG_HW_RANDOM_MTK=m
# CONFIG_R3964 is not set
#
# PCMCIA character devices
......@@ -2428,6 +2431,12 @@ CONFIG_ROCKCHIP_THERMAL=m
#
CONFIG_MTK_THERMAL=y
#
# Broadcom thermal drivers
#
# CONFIG_BCM2835_THERMAL is not set
CONFIG_BCM_NS_THERMAL=y
#
# Samsung thermal drivers
#
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.14.30 Kernel Configuration
# Linux/arm 4.14.136 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
......@@ -67,6 +67,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
CONFIG_GENERIC_IRQ_MIGRATION=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y
......@@ -615,7 +616,6 @@ CONFIG_PLAT_SAMSUNG=y
#
# Power management
#
# CONFIG_SAMSUNG_PM_CHECK is not set
CONFIG_ARCH_SHMOBILE=y
CONFIG_PM_RMOBILE=y
CONFIG_ARCH_RCAR_GEN1=y
......@@ -712,6 +712,8 @@ CONFIG_SWP_EMULATE=y
# CONFIG_CPU_BIG_ENDIAN is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set
CONFIG_CPU_SPECTRE=y
CONFIG_HARDEN_BRANCH_PREDICTOR=y
CONFIG_KUSER_HELPERS=y
CONFIG_VDSO=y
CONFIG_OUTER_CACHE=y
......@@ -2785,6 +2787,7 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_NOZOMI is not set
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
CONFIG_LDISC_AUTOLOAD=y
CONFIG_DEVMEM=y
# CONFIG_DEVKMEM is not set
......@@ -2896,7 +2899,6 @@ CONFIG_HW_RANDOM_MSM=y
CONFIG_HW_RANDOM_ST=y
CONFIG_HW_RANDOM_MESON=y
CONFIG_HW_RANDOM_MTK=y
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not set
......@@ -4363,7 +4365,6 @@ CONFIG_USB_F_SUBSET=m
CONFIG_USB_F_RNDIS=m
# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
# CONFIG_USB_AUDIO is not set
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
......@@ -4372,14 +4373,12 @@ CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_FUNCTIONFS is not set
# CONFIG_USB_MASS_STORAGE is not set
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_G_ACM_MS is not set
# CONFIG_USB_G_MULTI is not set
# CONFIG_USB_G_HID is not set
# CONFIG_USB_G_DBGP is not set
# CONFIG_USB_G_WEBCAM is not set
#
# USB Power Delivery and Type-C drivers
......@@ -4743,7 +4742,6 @@ CONFIG_DMA_ENGINE_RAID=y
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
# CONFIG_AUXDISPLAY is not set
# CONFIG_ARM_CHARLCD is not set
# CONFIG_UIO is not set
# CONFIG_VFIO is not set
# CONFIG_VIRT_DRIVERS is not set
......
......@@ -40,11 +40,15 @@ index 035cd3f..87c91f7 100644
if (test_and_set_bit_lock(EXT4_FLAGS_RESIZING,
&EXT4_SB(sb)->s_ext4_flags))
ret = -EBUSY;
@@ -2015,6 +2024,8 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
@@ -2015,10 +2024,11 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
free_flex_gd(flex_gd);
if (resize_inode != NULL)
iput(resize_inode);
- ext4_msg(sb, KERN_INFO, "resized filesystem to %llu", n_blocks_count);
if (err)
ext4_warning(sb, "error (%d) occurred during "
"file system resize", err);
- ext4_msg(sb, KERN_INFO, "resized filesystem to %llu",
- ext4_blocks_count(es));
+ if (!err)
+ ext4_msg(sb, KERN_INFO, "resized filesystem to %llu",
+ n_blocks_count);
......
-----BEGIN PGP SIGNATURE-----
Comment: This signature is for the .tar version of the archive
Comment: git archive --format tar --prefix=linux-4.14.136/ v4.14.136
Comment: git version 2.22.0
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl1GijQACgkQONu9yGCS
aT6ZZxAAtME8jdHw6Z6poa+9H40r602l5YlxeAL8jDvHo8nLmGtox16vFr53WCyb
UWqUa8resgL3/doyQmpK2efMcCT5KOxvfA2q/EdZkd9HX+7oxQi55DxZI+fp+p80
bgCou/naN0td4DU3qdDD+6tCATFKMSlr48P8ZRLaoPilgMLRUjqvmicQ37xsM29f
7rYFtzRSuOAIFUaA5WVuD+Y0vt2/7WFBmETP4WkovN08+UKQ1nToa5At3rrC0RaD
mAQFspY4P3znmF30xUlrXBo7QJ2n++N7VcN7KeM7o/G4b8M3S8L3UeIavslG/3Ro
Fo+gPbM+099mpEGprSWrTzBls6PNZO6FI2JHdeFENVbi1z+uxvR9sqfzgmzkuFKL
S4mnzZ7Ik+GnbcCBl+yrJqnSYlmYn1aVWjdm2YpDAlVIJiZA29NuUFjHYB6kpSpw
5WDkxkxYtoVFGdLBCueJWiAdsO8TuMHRc5o1ypjiHSQDWuFTqNWHxEq5D0MrsmMG
esGd8VoJ/JVzMGC27Yb4Ws4C8HRr4mcQxWBa570txxeWFxACDJu0xKCxl5pk7RlT
us4Ni3/nqjU/ZcRyifCe92zNTMGFad0y7o5FvXW9i9S/5RjWg734RujQiswlXt6T
EvmX/nXoL4iKK+7lPo7hOr5LHUrn6IE/gpoR7k8KQ79nENfPyt8=
=VIPE
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlq2IgYACgkQONu9yGCS
aT5JQA//SkNR88Xt64xFEpty7zAU7Ym1B3Jt6qTa+azQgfb6NVEAXj/xheFdbwbC
uRwShQ7VrA0mSdUQZsH7be6pING18Tz8pbQlanbLmOEWflMWGxzDyQatonk0PVWo
VSs2rpxzwGzHtWbEMR9r0t1AS3q4yIN+cEEgd6VNtKsdbqWUcWYFACGsRu9UUyq6
0ufH3M8U93ogf800gyjshh8JqRbq6tj5jIaA733gC8g/8mEwwZPDvmx3xcAuxi1u
S2bn3EttrJSgTZkfHZmIib+Wmn/Pt/n2muL/NcvtqzUzKd9CTkV+df73sD/47pmB
7hS+kxkvJIiSzsFplNs8IksdXMCPgBkb8v1Ysn4shsCHPCPDNn1p7k95uNMEeQ6T
9/s1vNaxz6mfAgNi5jL3MWk3pw7XZDv5pPP7LM1myumae0MvBkq7gva9Qoozot4/
W2kVf0vd3LaG0b7edKnzlYJkc8OjqpAHZr2KrkashuwXsCh/qJKLuZBgPfpLhuQr
o8UoaQUNnBVHvQkoPstOAgEnwGEgx8ltl+kMLE3a7HuP34l67/6znpBNbp0FObUs
cRzczl6NNHZZyubCB9Tct/2VMws13VP9aLwc5/elaW/AQCnW+ZBm5SwkyTaBNvcW
1X8ENh0rO3F/kpedzn6GyfXK9GWCOPhY1qUnDPPNVeCuRQJBoVs=
=837A
-----END PGP SIGNATURE-----
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment