Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72438f8c authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents fb4ee675 c1d84a1b

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ F: Documentation/ABI/testing/sysfs-bus-acpi 
F:	Documentation/ABI/testing/configfs-acpi

F:	drivers/pci/*acpi*

F:	drivers/pci/*/*acpi*

F:	drivers/pci/*/*/*acpi*

F:	tools/power/acpi/



ACPI APEI
@@ -8608,7 +8607,6 @@ F: include/linux/spinlock*.h 
F:	arch/*/include/asm/spinlock*.h

F:	include/linux/rwlock*.h

F:	include/linux/mutex*.h

F:	arch/*/include/asm/mutex*.h

F:	include/linux/rwsem*.h

F:	arch/*/include/asm/rwsem.h

F:	include/linux/seqlock.h

arch/arm/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ void pci_ioremap_set_mem_type(int mem_type) 


int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr)

{

	BUG_ON(offset + SZ_64K > IO_SPACE_LIMIT);

	BUG_ON(offset + SZ_64K - 1 > IO_SPACE_LIMIT);



	return ioremap_page_range(PCI_IO_VIRT_BASE + offset,

				  PCI_IO_VIRT_BASE + offset + SZ_64K,

arch/arm/tools/syscall.tbl

+1 −0
Original line number Diff line number Diff line
@@ -413,3 +413,4 @@ 
396	common	pkey_free		sys_pkey_free

397	common	statx			sys_statx

398	common	rseq			sys_rseq

399	common	io_pgetevents		sys_io_pgetevents

arch/powerpc/kvm/book3s_64_mmu_radix.c

+10 −0
Original line number Diff line number Diff line
@@ -646,6 +646,16 @@ int kvmppc_book3s_radix_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	 */

	local_irq_disable();

	ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);

	/*

	 * If the PTE disappeared temporarily due to a THP

	 * collapse, just return and let the guest try again.

	 */

	if (!ptep) {

		local_irq_enable();

		if (page)

			put_page(page);

		return RESUME_GUEST;

	}

	pte = *ptep;

	local_irq_enable();

arch/riscv/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void __init setup_bootmem(void) 
	BUG_ON(mem_size == 0);



	set_max_mapnr(PFN_DOWN(mem_size));

	max_low_pfn = pfn_base + PFN_DOWN(mem_size);

	max_low_pfn = memblock_end_of_DRAM();



#ifdef CONFIG_BLK_DEV_INITRD

	setup_initrd();