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

Commit 14ef2b0c authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus 

Conflicts:
	drivers/hid/Kconfig
parents 57ab12e4 71b38bd4

Documentation/fault-injection/fault-injection.txt

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ o provide a way to configure fault attributes 
  failslab, fail_page_alloc, and fail_make_request use this way.

  Helper functions:



	init_fault_attr_entries(entries, attr, name);

	void cleanup_fault_attr_entries(entries);

	init_fault_attr_dentries(entries, attr, name);

	void cleanup_fault_attr_dentries(entries);



- module parameters

arch/x86/mm/init_64.c

+19 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <asm/numa.h>

#include <asm/cacheflush.h>

#include <asm/init.h>

#include <linux/bootmem.h>



static unsigned long dma_reserve __initdata;
@@ -615,6 +616,21 @@ void __init paging_init(void) 
 * Memory hotplug specific functions

 */

#ifdef CONFIG_MEMORY_HOTPLUG

/*

 * After memory hotplug the variables max_pfn, max_low_pfn and high_memory need

 * updating.

 */

static void  update_end_of_memory_vars(u64 start, u64 size)

{

	unsigned long end_pfn = PFN_UP(start + size);



	if (end_pfn > max_pfn) {

		max_pfn = end_pfn;

		max_low_pfn = end_pfn;

		high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;

	}

}



/*

 * Memory is added always to NORMAL zone. This means you will never get

 * additional DMA/DMA32 memory.
@@ -634,6 +650,9 @@ int arch_add_memory(int nid, u64 start, u64 size) 
	ret = __add_pages(nid, zone, start_pfn, nr_pages);

	WARN_ON_ONCE(ret);



	/* update max_pfn, max_low_pfn and high_memory */

	update_end_of_memory_vars(start, size);



	return ret;

}

EXPORT_SYMBOL_GPL(arch_add_memory);

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static void pkt_sysfs_dev_remove(struct pktcdvd_device *pd) 
	pkt_kobj_remove(pd->kobj_stat);

	pkt_kobj_remove(pd->kobj_wqueue);

	if (class_pktcdvd)

		device_destroy(class_pktcdvd, pd->pkt_dev);

		device_unregister(pd->dev);

}

drivers/bluetooth/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -195,5 +195,16 @@ config BT_MRVL_SDIO 
	  Say Y here to compile support for Marvell BT-over-SDIO driver

	  into the kernel or say M to compile it as module.



endmenu

config BT_ATH3K

	tristate "Atheros firmware download driver"

	depends on BT_HCIBTUSB

	select FW_LOADER

	help

	  Bluetooth firmware download driver.

	  This driver loads the firmware into the Atheros Bluetooth

	  chipset.



	  Say Y here to compile support for "Atheros firmware download driver"

	  into the kernel or say M to compile it as module (ath3k).



endmenu

drivers/bluetooth/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_BT_HCIBTUART) += btuart_cs.o 
obj-$(CONFIG_BT_HCIBTUSB)	+= btusb.o

obj-$(CONFIG_BT_HCIBTSDIO)	+= btsdio.o



obj-$(CONFIG_BT_ATH3K)		+= ath3k.o

obj-$(CONFIG_BT_MRVL)		+= btmrvl.o

obj-$(CONFIG_BT_MRVL_SDIO)	+= btmrvl_sdio.o