Commit 0c3852ad authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up fixes.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents be3392b6 c3eb11fb

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -15952,6 +15952,7 @@ Q: https://patchwork.kernel.org/project/linux-pci/list/ 
B:	https://bugzilla.kernel.org

C:	irc://irc.oftc.net/linux-pci

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git

F:	Documentation/devicetree/bindings/pci/

F:	drivers/pci/controller/

F:	drivers/pci/pci-bridge-emul.c

F:	drivers/pci/pci-bridge-emul.h
@@ -16058,7 +16059,7 @@ F: Documentation/devicetree/bindings/pci/microchip* 
F:	drivers/pci/controller/*microchip*









PCIE DRIVER FOR QUALCOMM MSM









M:	Stanimir Varbanov <svarbanov@mm-sol.com>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









L:	linux-pci@vger.kernel.org









L:	linux-arm-msm@vger.kernel.org









S:	Maintained
































Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 1









SUBLEVEL = 0









EXTRAVERSION = -rc5









EXTRAVERSION = -rc6









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*
































arch/powerpc/kernel/vmlinux.lds.S



+1
−1






























Original line number
Diff line number
Diff line







@@ -142,7 +142,7 @@ SECTIONS







#endif



















	.data.rel.ro : AT(ADDR(.data.rel.ro) - LOAD_OFFSET) {









		*(.data.rel.ro*)









		*(.data.rel.ro .data.rel.ro.*)









	}



















	.branch_lt : AT(ADDR(.branch_lt) - LOAD_OFFSET) {
































arch/x86/events/amd/core.c



+2
−3






























Original line number
Diff line number
Diff line







@@ -861,8 +861,7 @@ static int amd_pmu_handle_irq(struct pt_regs *regs)







	pmu_enabled = cpuc->enabled;









	cpuc->enabled = 0;



















	/* stop everything (includes BRS) */









	amd_pmu_disable_all();









	amd_brs_disable_all();



















	/* Drain BRS is in use (could be inactive) */









	if (cpuc->lbr_users)








@@ -873,7 +872,7 @@ static int amd_pmu_handle_irq(struct pt_regs *regs)

















	cpuc->enabled = pmu_enabled;









	if (pmu_enabled)









		amd_pmu_enable_all(0);









		amd_brs_enable_all();



















	return amd_pmu_adjust_nmi_window(handled);









}
































arch/x86/events/amd/uncore.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -553,6 +553,7 @@ static void uncore_clean_online(void)

















	hlist_for_each_entry_safe(uncore, n, &uncore_unused_list, node) {









		hlist_del(&uncore->node);









		kfree(uncore->events);









		kfree(uncore);









	}









}