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

Commit eec19d1a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into timers/core 



Resolve semantic conflict in kernel/time/timekeeping.c.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f726a697 a0185401

Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt

+2 −0
Original line number Diff line number Diff line
@@ -1626,3 +1626,5 @@ MX6Q_PAD_SD2_DAT3__PCIE_CTRL_MUX_11 1587 
MX6Q_PAD_SD2_DAT3__GPIO_1_12			1588

MX6Q_PAD_SD2_DAT3__SJC_DONE			1589

MX6Q_PAD_SD2_DAT3__ANATOP_TESTO_3		1590

MX6Q_PAD_ENET_RX_ER__ANATOP_USBOTG_ID		1591

MX6Q_PAD_GPIO_1__ANATOP_USBOTG_ID		1592

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -3433,13 +3433,14 @@ S: Supported 
F:	drivers/idle/i7300_idle.c



IEEE 802.15.4 SUBSYSTEM

M:	Alexander Smirnov <alex.bluesman.smirnov@gmail.com>

M:	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

M:	Sergey Lapin <slapin@ossfans.org>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	http://apps.sourceforge.net/trac/linux-zigbee

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git

S:	Maintained

F:	net/ieee802154/

F:	net/mac802154/

F:	drivers/ieee802154/



IIO SUBSYSTEM AND DRIVERS

arch/arm/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ error: 
	while (--i)

		if (pages[i])

			__free_pages(pages[i], 0);

	if (array_size < PAGE_SIZE)

	if (array_size <= PAGE_SIZE)

		kfree(pages);

	else

		vfree(pages);
@@ -1106,7 +1106,7 @@ static int __iommu_free_buffer(struct device *dev, struct page **pages, size_t s 
	for (i = 0; i < count; i++)

		if (pages[i])

			__free_pages(pages[i], 0);

	if (array_size < PAGE_SIZE)

	if (array_size <= PAGE_SIZE)

		kfree(pages);

	else

		vfree(pages);

drivers/gpu/drm/gma500/cdv_device.c

+19 −16
Original line number Diff line number Diff line
@@ -78,21 +78,6 @@ static int cdv_backlight_combination_mode(struct drm_device *dev) 
	return REG_READ(BLC_PWM_CTL2) & PWM_LEGACY_MODE;

}



static int cdv_get_brightness(struct backlight_device *bd)

{

	struct drm_device *dev = bl_get_data(bd);

	u32 val = REG_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;



	if (cdv_backlight_combination_mode(dev)) {

		u8 lbpc;



		val &= ~1;

		pci_read_config_byte(dev->pdev, 0xF4, &lbpc);

		val *= lbpc;

	}

	return val;

}



static u32 cdv_get_max_backlight(struct drm_device *dev)

{

	u32 max = REG_READ(BLC_PWM_CTL);
@@ -110,6 +95,22 @@ static u32 cdv_get_max_backlight(struct drm_device *dev) 
	return max;

}



static int cdv_get_brightness(struct backlight_device *bd)

{

	struct drm_device *dev = bl_get_data(bd);

	u32 val = REG_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;



	if (cdv_backlight_combination_mode(dev)) {

		u8 lbpc;



		val &= ~1;

		pci_read_config_byte(dev->pdev, 0xF4, &lbpc);

		val *= lbpc;

	}

	return (val * 100)/cdv_get_max_backlight(dev);



}



static int cdv_set_brightness(struct backlight_device *bd)

{

	struct drm_device *dev = bl_get_data(bd);
@@ -120,6 +121,9 @@ static int cdv_set_brightness(struct backlight_device *bd) 
	if (level < 1)

		level = 1;



	level *= cdv_get_max_backlight(dev);

	level /= 100;



	if (cdv_backlight_combination_mode(dev)) {

		u32 max = cdv_get_max_backlight(dev);

		u8 lbpc;
@@ -157,7 +161,6 @@ static int cdv_backlight_init(struct drm_device *dev) 


	cdv_backlight_device->props.brightness =

			cdv_get_brightness(cdv_backlight_device);

	cdv_backlight_device->props.max_brightness = cdv_get_max_backlight(dev);

	backlight_update_status(cdv_backlight_device);

	dev_priv->backlight_device = cdv_backlight_device;

	return 0;

drivers/gpu/drm/gma500/opregion.c

+3 −5
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ struct opregion_asle { 


#define ASLE_CBLV_VALID         (1<<31)



static struct psb_intel_opregion *system_opregion;



static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)

{

	struct drm_psb_private *dev_priv = dev->dev_private;
@@ -205,7 +207,7 @@ void psb_intel_opregion_enable_asle(struct drm_device *dev) 
	struct drm_psb_private *dev_priv = dev->dev_private;

	struct opregion_asle *asle = dev_priv->opregion.asle;



	if (asle) {

	if (asle && system_opregion ) {

		/* Don't do this on Medfield or other non PC like devices, they

		   use the bit for something different altogether */

		psb_enable_pipestat(dev_priv, 0, PIPE_LEGACY_BLC_EVENT_ENABLE);
@@ -221,7 +223,6 @@ void psb_intel_opregion_enable_asle(struct drm_device *dev) 
#define ACPI_EV_LID            (1<<1)

#define ACPI_EV_DOCK           (1<<2)



static struct psb_intel_opregion *system_opregion;



static int psb_intel_opregion_video_event(struct notifier_block *nb,

					  unsigned long val, void *data)
@@ -266,9 +267,6 @@ void psb_intel_opregion_init(struct drm_device *dev) 
		system_opregion = opregion;

		register_acpi_notifier(&psb_intel_opregion_notifier);

	}



	if (opregion->asle)

		psb_intel_opregion_enable_asle(dev);

}



void psb_intel_opregion_fini(struct drm_device *dev)