Skip to content

Commit 1039617

Browse files
ramabondanpramabondanp
committed
Merge Linux Stable 4.14.171 into sdm-pie
98db2bf Linux 4.14.171 a5efc7d libertas: make lbs_ibss_join_existing() return error code on rates overflow 783c962 libertas: don't exit from lbs_ibss_join_existing() with RCU read lock held 43e1890 mwifiex: Fix possible buffer overflows in mwifiex_cmd_append_vsie_tlv() 49e9f10 mwifiex: Fix possible buffer overflows in mwifiex_ret_wmm_get_status() 9b95c9d serial: uartps: Move the spinlock after the read of the tx empty ad6026d dm: fix potential for q->make_request_fn NULL pointer f2cfc60 scsi: megaraid_sas: Do not initiate OCR if controller is not in ready state 8b36032 pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B 079c03b media: i2c: adv748x: Fix unsafe macros 0b751f3 crypto: atmel-sha - fix error handling when setting hmac key bcf27e2 crypto: artpec6 - return correct error code for failed setkey() 4b99ae6 KVM: arm/arm64: Fix young bit from mmu notifier 1e26078 arm64: cpufeature: Fix the type of no FP/SIMD capability c3f4c5e ARM: 8949/1: mm: mark free_memmap as __init d73066c KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections cef509c powerpc/pseries: Allow not having ibm, hypertas-functions::hcall-multi-tce for DDW 197cd72 powerpc/pseries/vio: Fix iommu_table use-after-free refcount warning 4a7a57c tools/power/acpi: fix compilation error 59d6a09 ARM: dts: at91: sama5d3: define clock rate range for tcb1 bc2807c ARM: dts: at91: sama5d3: fix maximum peripheral clock rates cf2647f platform/x86: intel_mid_powerbtn: Take a copy of ddata 18a698a ARC: [plat-axs10x]: Add missing multicast filter number to GMAC node 1eaca30 rtc: cmos: Stop using shared IRQ 64ab2bb rtc: hym8563: Return -EINVAL if the time is known to be invalid 6933267 serial: uartps: Add a timeout to the tx empty wait 0cffbe2 NFSv4: try lease recovery on NFS4ERR_EXPIRED e69fb85 NFS/pnfs: Fix pnfs_generic_prepare_to_resend_writes() 15466c4 nfs: NFS_SWAP should depend on SWAP 2edc1dc PCI: Don't disable bridge BARs when assigning bus resources b642fb0 PCI/switchtec: Fix vep_vector_number ioread width 251601c scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails 38df0eb RDMA/netlink: Do not always generate an ACK for some netlink operations 9b16418 hv_sock: Remove the accept port restriction c7d57b1 ASoC: pcm: update FE/BE trigger order based on the command c12b8cb rxrpc: Fix service call disconnection f993a79 perf/core: Fix mlock accounting in perf_mmap() 2106d26 clocksource: Prevent double add_timer_on() for watchdog_timer 640d7fb cifs: fail i/o on soft mounts if sessionsetup errors out 9a473fc KVM: s390: do not clobber registers during guest reset/store status 0941ce4 KVM: Play nice with read-only memslots when querying host page size f8d4d63 KVM: Use vcpu-specific gva->hva translation when querying host page size a4870bd KVM: nVMX: vmread should not set rflags to specify success in case of #PF 0715743 KVM: VMX: Add non-canonical check on writes to RTIT address MSRs 6b26d90 KVM: x86/mmu: Apply max PA check for MMIO sptes to 32-bit KVM 0eed3d7 KVM: x86: Fix potential put_fpu() w/o load_fpu() on MPX platform 8d3a5b8 btrfs: flush write bio if we loop in extent_write_cache_pages ce02876 KVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks a31a66f drm: atmel-hlcdc: enable clock before configuring timing engine f6eb1d5 Btrfs: fix race between adding and putting tree mod seq elements and nodes 1066f7e btrfs: remove trivial locking wrappers of tree mod log 8d9ec37 btrfs: free block groups after free'ing fs trees 71f54d0 btrfs: use bool argument in free_root_pointers() 1d5a590 Btrfs: fix missing hole after hole punching and fsync when using NO_HOLES 8a024c0 Btrfs: fix assertion failure on fsync with NO_HOLES enabled cf1569d btrfs: Get rid of the confusing btrfs_file_extent_inline_len 7be41b3 ext4: fix deadlock allocating crypto bounce page from mempool 3576bb2 bonding/alb: properly access headers in bond_alb_xmit() 196491f net: macb: Limit maximum GEM TX length in TSO 03d7740 net: macb: Remove unnecessary alignment check for TSO 1d4754d net: systemport: Avoid RBUF stuck in Wake-on-LAN mode e79fbd7 net_sched: fix a resource leak in tcindex_set_parms() ad998ed net: dsa: bcm_sf2: Only 7278 supports 2Gb/sec IMP port c338e06 mfd: rn5t618: Mark ADC control register volatile 31aa47d mfd: da9062: Fix watchdog compatible string c91730d ubi: Fix an error pointer dereference in error handling code 9ab31c4 ubi: fastmap: Fix inverted logic in seen selfcheck a0f808e nfsd: fix jiffies/time_t mixup in LRU list 7558ea7 nfsd: fix delay timer on 32-bit architectures fc18aad IB/core: Fix ODP get user pages flow 47e1f18 IB/mlx5: Fix outstanding_pi index for GSI qps 0b8e15f net: tulip: Adjust indentation in {dmfe, uli526x}_init_module 9426899 net: smc911x: Adjust indentation in smc911x_phy_configure e94b702 ppp: Adjust indentation into ppp_async_input c4ceea2 NFC: pn544: Adjust indentation in pn544_hci_check_presence 4f91c79 powerpc/44x: Adjust indentation in ibm4xx_denali_fixup_memsize 00ab265 ext2: Adjust indentation in ext2_fill_super 0225f69 phy: qualcomm: Adjust indentation in read_poll_timeout c909605 scsi: ufs: Recheck bkops level if bkops is disabled f9082f8 scsi: qla4xxx: Adjust indentation in qla4xxx_mem_free 0ee2818 scsi: csiostor: Adjust indentation in csio_device_reset 2585e20 scsi: qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type a6f16a6 clk: tegra: Mark fuse clock as critical 724fbee KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails f572810 KVM: PPC: Book3S PR: Free shared page if mmu initialization fails 7fe5a37 KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails 4609a0b KVM: x86: Protect MSR-based index computations in fixed_msr_to_seg_unit() from Spectre-v1/L1TF attacks 703ae42 KVM: x86: Protect x86_decode_insn from Spectre-v1/L1TF attacks 86f71e8 KVM: x86: Protect MSR-based index computations from Spectre-v1/L1TF attacks in x86.c ec01d89 KVM: x86: Protect ioapic_read_indirect() from Spectre-v1/L1TF attacks 6b58586 KVM: x86: Protect MSR-based index computations in pmu.h from Spectre-v1/L1TF attacks aa209fe KVM: x86: Protect ioapic_write_indirect() from Spectre-v1/L1TF attacks 3645b22 KVM: x86: Protect kvm_hv_msr_[get|set]_crash_data() from Spectre-v1/L1TF attacks 112a14b KVM: x86: Protect kvm_lapic_reg_write() from Spectre-v1/L1TF attacks 8fd994e KVM: x86: Protect DR-based index computations from Spectre-v1/L1TF attacks 7341bf4 KVM: x86: Refactor prefix decoding to prevent Spectre-v1/L1TF attacks 0be275c KVM: x86: Refactor picdev_write() to prevent Spectre-v1/L1TF attacks 80b93cc xen/balloon: Support xend-based toolstack take two 9c1484c tools/kvm_stat: Fix kvm_exit filter name 4274984 sunrpc: expiry_time should be seconds not timeval 6a7ad15 mwifiex: fix unbalanced locking in mwifiex_process_country_ie() d2cf229 iwlwifi: don't throw error when trying to remove IGTK 06bd486 ARM: tegra: Enable PLLP bypass during Tegra124 LP1 f7a7788 btrfs: set trans->drity in btrfs_commit_transaction d046cfa NFS: Directory page cache pages need to be locked when read 1201127 NFS: Fix memory leaks and corruption in readdir 56846c9 scsi: qla2xxx: Fix unbound NVME response length a793a26 crypto: picoxcell - adjust the position of tasklet_init and fix missed tasklet_kill 90060df crypto: api - Fix race condition in crypto_spawn_alg 6042a22 crypto: atmel-aes - Fix counter overflow in CTR mode 3b7b3a5 crypto: pcrypt - Do not clear MAY_SLEEP flag in original request 6590628 crypto: ccp - set max RSA modulus size for v3 platform devices as well f536b55 samples/bpf: Don't try to remove user's homedir on clean e78ca4d ftrace: Protect ftrace_graph_hash with ftrace_sync 5aa98ea ftrace: Add comment to why rcu_dereference_sched() is open coded bdfe89c tracing: Annotate ftrace_graph_notrace_hash pointer with __rcu d107132 tracing: Annotate ftrace_graph_hash pointer with __rcu 41724df dm crypt: fix benbi IV constructor crash if used in authenticated mode 28ae705 dm space map common: fix to ensure new block isn't already in use 9b52f0b dm zoned: support zone sizes smaller than 128MiB a687c3b of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc 5d56260 PM: core: Fix handling of devices deleted during system-wide resume 084f3fc f2fs: code cleanup for f2fs_statfs_project() 646b255 f2fs: fix miscounted block limit in f2fs_statfs_project() 182f211 f2fs: choose hardlimit when softlimit is larger than hardlimit in f2fs_statfs_project() 3bb3775 power: supply: ltc2941-battery-gauge: fix use-after-free 724106f scsi: qla2xxx: Fix mtcp dump collection failure 4fa9dd9 crypto: api - Check spawn->alg under lock in crypto_drop_spawn 0fb0ea3 hv_balloon: Balloon up according to request page number 7c5cf5c ubifs: don't trigger assertion on invalid no-key filename 87c639a mmc: sdhci-of-at91: fix memleak on clk_get failure 969917d PCI: keystone: Fix link training retries initiation 3de94c3 ubifs: Fix deadlock in concurrent bulk-read and writepage d95ec03 ubifs: Fix FS_IOC_SETFLAGS unexpectedly clearing encrypt flag c68fb6c ubifs: Reject unsupported ioctl flags explicitly 7e372f6 alarmtimer: Unregister wakeup source when module get fails bfd90b0 ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards 3760557 mmc: spi: Toggle SPI polarity, do not hardcode it 11f5432 powerpc/pseries: Advance pfn if section is not present in lmb_is_removable() 5823cb6 powerpc/xmon: don't access ASDR in VMs 6d4f459 s390/mm: fix dynamic pagetable upgrade for hugetlbfs dd2624a MIPS: fix indentation of the 'RELOCS' message 4ab1624 KVM: arm64: Only sign-extend MMIO up to register width c314b82 platform/x86: intel_scu_ipc: Fix interrupt support 89f75bf irqdomain: Fix a memory leak in irq_domain_push_irq() 0649546 lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more() 48d8bba media: v4l2-rect.h: fix v4l2_rect_map_inside() top/left adjustments bfc1bb3 media/v4l2-core: set pages dirty upon releasing DMA buffers d219e27 ALSA: dummy: Fix PCM format loop in proc output 7d0c0df usb: gadget: f_ecm: Use atomic_t to track in-flight request 51f94eb usb: gadget: f_ncm: Use atomic_t to track in-flight request 6d90605 usb: gadget: legacy: set max_speed to super-speed 67cd8cc brcmfmac: Fix memory leak in brcmf_usbdev_qinit 93b8f11 tracing: Fix sched switch start/stop refcount racy updates bc40755 mfd: dln2: More sanity checking for endpoints 52f001b media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors 3740a60 rxrpc: Fix NULL pointer deref due to call->conn being cleared on disconnect 532e255 rxrpc: Fix insufficient receive notification generation e1b992f tcp: clear tp->segs_{in|out} in tcp_disconnect() deae87c tcp: clear tp->data_segs{in|out} in tcp_disconnect() 4d469d9 tcp: clear tp->delivered in tcp_disconnect() 24070b4 tcp: clear tp->total_retrans in tcp_disconnect() fa32d7c bnxt_en: Fix TC queue mapping. 6cb448e net_sched: fix an OOB access in cls_tcindex 7950ef0 net: hsr: fix possible NULL deref in hsr_handle_frame() ff8e755 l2tp: Allow duplicate session creation with UDP 52083ed gtp: use __GFP_NOWARN to avoid memalloc warning 4422093 cls_rsvp: fix rsvp_policy fc91784 sparc32: fix struct ipc64_perm type definition 7a63a59 iwlwifi: mvm: fix NVM check for 3168 devices 57da5bc x86/cpu: Update cached HLE state on write to TSX_CTRL_CPUID_CLEAR 9a4da2a media: iguanair: fix endpoint sanity check 7645d80 kernel/module: Fix memleak in module_add_modinfo_attrs() Signed-off-by: Rama Bondan Prakoso <[email protected]> Conflicts: drivers/of/Kconfig drivers/scsi/ufs/ufshcd.c kernel/time/alarmtimer.c
2 parents bdb51da + 98db2bf commit 1039617

File tree

187 files changed

+9305
-954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+9305
-954
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 14
4-
SUBLEVEL = 170
4+
SUBLEVEL = 171
55
EXTRAVERSION =
66
NAME = Petit Gorille
77

‎arch/arc/boot/dts/axs10x_mb.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
interrupt-names = "macirq";
7171
phy-mode = "rgmii";
7272
snps,pbl = < 32 >;
73+
snps,multicast-filter-bins = <256>;
7374
clocks = <&apbclk>;
7475
clock-names = "stmmaceth";
7576
max-speed = <100>;

‎arch/arm/boot/dts/sama5d3.dtsi‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,49 +1185,49 @@
11851185
usart0_clk: usart0_clk {
11861186
#clock-cells = <0>;
11871187
reg = <12>;
1188-
atmel,clk-output-range = <0 66000000>;
1188+
atmel,clk-output-range = <0 83000000>;
11891189
};
11901190

11911191
usart1_clk: usart1_clk {
11921192
#clock-cells = <0>;
11931193
reg = <13>;
1194-
atmel,clk-output-range = <0 66000000>;
1194+
atmel,clk-output-range = <0 83000000>;
11951195
};
11961196

11971197
usart2_clk: usart2_clk {
11981198
#clock-cells = <0>;
11991199
reg = <14>;
1200-
atmel,clk-output-range = <0 66000000>;
1200+
atmel,clk-output-range = <0 83000000>;
12011201
};
12021202

12031203
usart3_clk: usart3_clk {
12041204
#clock-cells = <0>;
12051205
reg = <15>;
1206-
atmel,clk-output-range = <0 66000000>;
1206+
atmel,clk-output-range = <0 83000000>;
12071207
};
12081208

12091209
uart0_clk: uart0_clk {
12101210
#clock-cells = <0>;
12111211
reg = <16>;
1212-
atmel,clk-output-range = <0 66000000>;
1212+
atmel,clk-output-range = <0 83000000>;
12131213
};
12141214

12151215
twi0_clk: twi0_clk {
12161216
reg = <18>;
12171217
#clock-cells = <0>;
1218-
atmel,clk-output-range = <0 16625000>;
1218+
atmel,clk-output-range = <0 41500000>;
12191219
};
12201220

12211221
twi1_clk: twi1_clk {
12221222
#clock-cells = <0>;
12231223
reg = <19>;
1224-
atmel,clk-output-range = <0 16625000>;
1224+
atmel,clk-output-range = <0 41500000>;
12251225
};
12261226

12271227
twi2_clk: twi2_clk {
12281228
#clock-cells = <0>;
12291229
reg = <20>;
1230-
atmel,clk-output-range = <0 16625000>;
1230+
atmel,clk-output-range = <0 41500000>;
12311231
};
12321232

12331233
mci0_clk: mci0_clk {
@@ -1243,19 +1243,19 @@
12431243
spi0_clk: spi0_clk {
12441244
#clock-cells = <0>;
12451245
reg = <24>;
1246-
atmel,clk-output-range = <0 133000000>;
1246+
atmel,clk-output-range = <0 166000000>;
12471247
};
12481248

12491249
spi1_clk: spi1_clk {
12501250
#clock-cells = <0>;
12511251
reg = <25>;
1252-
atmel,clk-output-range = <0 133000000>;
1252+
atmel,clk-output-range = <0 166000000>;
12531253
};
12541254

12551255
tcb0_clk: tcb0_clk {
12561256
#clock-cells = <0>;
12571257
reg = <26>;
1258-
atmel,clk-output-range = <0 133000000>;
1258+
atmel,clk-output-range = <0 166000000>;
12591259
};
12601260

12611261
pwm_clk: pwm_clk {
@@ -1266,7 +1266,7 @@
12661266
adc_clk: adc_clk {
12671267
#clock-cells = <0>;
12681268
reg = <29>;
1269-
atmel,clk-output-range = <0 66000000>;
1269+
atmel,clk-output-range = <0 83000000>;
12701270
};
12711271

12721272
dma0_clk: dma0_clk {
@@ -1297,13 +1297,13 @@
12971297
ssc0_clk: ssc0_clk {
12981298
#clock-cells = <0>;
12991299
reg = <38>;
1300-
atmel,clk-output-range = <0 66000000>;
1300+
atmel,clk-output-range = <0 83000000>;
13011301
};
13021302

13031303
ssc1_clk: ssc1_clk {
13041304
#clock-cells = <0>;
13051305
reg = <39>;
1306-
atmel,clk-output-range = <0 66000000>;
1306+
atmel,clk-output-range = <0 83000000>;
13071307
};
13081308

13091309
sha_clk: sha_clk {

‎arch/arm/boot/dts/sama5d3_can.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
can0_clk: can0_clk {
3838
#clock-cells = <0>;
3939
reg = <40>;
40-
atmel,clk-output-range = <0 66000000>;
40+
atmel,clk-output-range = <0 83000000>;
4141
};
4242

4343
can1_clk: can1_clk {
4444
#clock-cells = <0>;
4545
reg = <41>;
46-
atmel,clk-output-range = <0 66000000>;
46+
atmel,clk-output-range = <0 83000000>;
4747
};
4848
};
4949
};

‎arch/arm/boot/dts/sama5d3_tcb1.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
tcb1_clk: tcb1_clk {
2424
#clock-cells = <0>;
2525
reg = <27>;
26+
atmel,clk-output-range = <0 166000000>;
2627
};
2728
};
2829
};

‎arch/arm/boot/dts/sama5d3_uart.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
uart0_clk: uart0_clk {
4343
#clock-cells = <0>;
4444
reg = <16>;
45-
atmel,clk-output-range = <0 66000000>;
45+
atmel,clk-output-range = <0 83000000>;
4646
};
4747

4848
uart1_clk: uart1_clk {
4949
#clock-cells = <0>;
5050
reg = <17>;
51-
atmel,clk-output-range = <0 66000000>;
51+
atmel,clk-output-range = <0 83000000>;
5252
};
5353
};
5454
};

‎arch/arm/include/asm/kvm_emulate.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@ static inline bool kvm_vcpu_dabt_issext(struct kvm_vcpu *vcpu)
144144
return kvm_vcpu_get_hsr(vcpu) & HSR_SSE;
145145
}
146146

147+
static inline bool kvm_vcpu_dabt_issf(const struct kvm_vcpu *vcpu)
148+
{
149+
return false;
150+
}
151+
147152
static inline int kvm_vcpu_dabt_get_rd(struct kvm_vcpu *vcpu)
148153
{
149154
return (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;

‎arch/arm/include/asm/kvm_mmio.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
struct kvm_decode {
2727
unsigned long rt;
2828
bool sign_extend;
29+
/* Not used on 32-bit arm */
30+
bool sixty_four;
2931
};
3032

3133
void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

‎arch/arm/mach-tegra/sleep-tegra30.S‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,14 @@ _pll_m_c_x_done:
382382
pll_locked r1, r0, CLK_RESET_PLLC_BASE
383383
pll_locked r1, r0, CLK_RESET_PLLX_BASE
384384

385+
tegra_get_soc_id TEGRA_APB_MISC_BASE, r1
386+
cmp r1, #TEGRA30
387+
beq 1f
388+
ldr r1, [r0, #CLK_RESET_PLLP_BASE]
389+
bic r1, r1, #(1<<31) @ disable PllP bypass
390+
str r1, [r0, #CLK_RESET_PLLP_BASE]
391+
1:
392+
385393
mov32 r7, TEGRA_TMRUS_BASE
386394
ldr r1, [r7]
387395
add r1, r1, #LOCK_DELAY
@@ -641,7 +649,10 @@ tegra30_switch_cpu_to_clk32k:
641649
str r0, [r4, #PMC_PLLP_WB0_OVERRIDE]
642650

643651
/* disable PLLP, PLLA, PLLC and PLLX */
652+
tegra_get_soc_id TEGRA_APB_MISC_BASE, r1
653+
cmp r1, #TEGRA30
644654
ldr r0, [r5, #CLK_RESET_PLLP_BASE]
655+
orrne r0, r0, #(1 << 31) @ enable PllP bypass on fast cluster
645656
bic r0, r0, #(1 << 30)
646657
str r0, [r5, #CLK_RESET_PLLP_BASE]
647658
ldr r0, [r5, #CLK_RESET_PLLA_BASE]

‎arch/arm/mm/init.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ static inline void poison_init_mem(void *s, size_t count)
356356
*p++ = 0xe7fddef0;
357357
}
358358

359-
static inline void
359+
static inline void __init
360360
free_memmap(unsigned long start_pfn, unsigned long end_pfn)
361361
{
362362
struct page *start_pg, *end_pg;

0 commit comments

Comments
 (0)