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

Commit 64b1f00a 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 16b99a4f 5301e3e1

MAINTAINERS

+9 −3
Original line number Diff line number Diff line
@@ -1667,6 +1667,12 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> 
S:	Supported

F:	drivers/tty/serial/atmel_serial.c



ATMEL Audio ALSA driver

M:	Bo Shen <voice.shen@atmel.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/atmel



ATMEL DMA DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -4791,14 +4797,14 @@ M: Deepak Saxena <dsaxena@plexity.net> 
S:	Maintained

F:	drivers/char/hw_random/ixp4xx-rng.c



INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)

INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)

M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>

M:	Jesse Brandeburg <jesse.brandeburg@intel.com>

M:	Bruce Allan <bruce.w.allan@intel.com>

M:	Carolyn Wyborny <carolyn.wyborny@intel.com>

M:	Don Skidmore <donald.c.skidmore@intel.com>

M:	Greg Rose <gregory.v.rose@intel.com>

M:	Alex Duyck <alexander.h.duyck@intel.com>

M:	Matthew Vick <matthew.vick@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

M:	Mitch Williams <mitch.a.williams@intel.com>

M:	Linux NICS <linux.nics@intel.com>
@@ -5486,7 +5492,7 @@ F: drivers/macintosh/ 
LINUX FOR POWERPC EMBEDDED MPC5XXX

M:	Anatolij Gustschin <agust@denx.de>

L:	linuxppc-dev@lists.ozlabs.org

T:	git git://git.denx.de/linux-2.6-agust.git

T:	git git://git.denx.de/linux-denx-agust.git

S:	Maintained

F:	arch/powerpc/platforms/512x/

F:	arch/powerpc/platforms/52xx/

drivers/cpufreq/cpufreq.c

+4 −3
Original line number Diff line number Diff line
@@ -1658,10 +1658,8 @@ void cpufreq_suspend(void) 
	if (!cpufreq_driver)

		return;



	cpufreq_suspended = true;



	if (!has_target())

		return;

		goto suspend;



	pr_debug("%s: Suspending Governors\n", __func__);
@@ -1674,6 +1672,9 @@ void cpufreq_suspend(void) 
			pr_err("%s: Failed to suspend driver: %p\n", __func__,

				policy);

	}



suspend:

	cpufreq_suspended = true;

}



/**

drivers/cpufreq/integrator-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ static int __init integrator_cpufreq_probe(struct platform_device *pdev) 
	return cpufreq_register_driver(&integrator_driver);

}



static void __exit integrator_cpufreq_remove(struct platform_device *pdev)

static int __exit integrator_cpufreq_remove(struct platform_device *pdev)

{

	cpufreq_unregister_driver(&integrator_driver);

	return cpufreq_unregister_driver(&integrator_driver);

}



static const struct of_device_id integrator_cpufreq_match[] = {

drivers/cpufreq/pcc-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy, 
	u32 input_buffer;

	int cpu;



	spin_lock(&pcc_lock);

	cpu = policy->cpu;

	pcc_cpu_data = per_cpu_ptr(pcc_cpu_info, cpu);
@@ -216,6 +215,7 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy, 
	freqs.old = policy->cur;

	freqs.new = target_freq;

	cpufreq_freq_transition_begin(policy, &freqs);

	spin_lock(&pcc_lock);



	input_buffer = 0x1 | (((target_freq * 100)

			       / (ioread32(&pcch_hdr->nominal) * 1000)) << 8);

drivers/gpu/drm/i915/i915_gem_gtt.c

+13 −1
Original line number Diff line number Diff line
@@ -1310,6 +1310,16 @@ void i915_check_and_clear_faults(struct drm_device *dev) 
	POSTING_READ(RING_FAULT_REG(&dev_priv->ring[RCS]));

}



static void i915_ggtt_flush(struct drm_i915_private *dev_priv)

{

	if (INTEL_INFO(dev_priv->dev)->gen < 6) {

		intel_gtt_chipset_flush();

	} else {

		I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);

		POSTING_READ(GFX_FLSH_CNTL_GEN6);

	}

}



void i915_gem_suspend_gtt_mappings(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1326,6 +1336,8 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev) 
				       dev_priv->gtt.base.start,

				       dev_priv->gtt.base.total,

				       true);



	i915_ggtt_flush(dev_priv);

}



void i915_gem_restore_gtt_mappings(struct drm_device *dev)
@@ -1378,7 +1390,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev) 
		gen6_write_pdes(container_of(vm, struct i915_hw_ppgtt, base));

	}



	i915_gem_chipset_flush(dev);

	i915_ggtt_flush(dev_priv);

}



int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj)