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

Commit 64c27237 authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/ethernet/marvell/mvneta.c

The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 77a99394 49d8137a

MAINTAINERS

+3 −2
Original line number Original line Diff line number Diff line
@@ -1839,8 +1839,8 @@ F: net/bluetooth/ 
F:	include/net/bluetooth/

F:	include/net/bluetooth/





BONDING DRIVER

BONDING DRIVER

M:	Jay Vosburgh <fubar@us.ibm.com>

M:	Jay Vosburgh <j.vosburgh@gmail.com>

M:	Veaceslav Falico <vfalico@redhat.com>

M:	Veaceslav Falico <vfalico@gmail.com>

M:	Andy Gospodarek <andy@greyhouse.net>

M:	Andy Gospodarek <andy@greyhouse.net>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://sourceforge.net/projects/bonding/

W:	http://sourceforge.net/projects/bonding/
@@ -6019,6 +6019,7 @@ F: include/uapi/linux/net.h 
F:	include/uapi/linux/netdevice.h

F:	include/uapi/linux/netdevice.h

F:	tools/net/

F:	tools/net/

F:	tools/testing/selftests/net/

F:	tools/testing/selftests/net/

F:	lib/random32.c





NETWORKING [IPv4/IPv6]

NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>

M:	"David S. Miller" <davem@davemloft.net>

arch/x86/include/asm/pgtable.h

+2 −12
Original line number Original line Diff line number Diff line
@@ -445,20 +445,10 @@ static inline int pte_same(pte_t a, pte_t b) 
	return a.pte == b.pte;

	return a.pte == b.pte;

}

}





static inline int pteval_present(pteval_t pteval)

{

	/*

	 * Yes Linus, _PAGE_PROTNONE == _PAGE_NUMA. Expressing it this

	 * way clearly states that the intent is that protnone and numa

	 * hinting ptes are considered present for the purposes of

	 * pagetable operations like zapping, protection changes, gup etc.

	 */

	return pteval & (_PAGE_PRESENT | _PAGE_PROTNONE | _PAGE_NUMA);

}



static inline int pte_present(pte_t a)

static inline int pte_present(pte_t a)

{

{

	return pteval_present(pte_flags(a));

	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE |

			       _PAGE_NUMA);

}

}





#define pte_accessible pte_accessible

#define pte_accessible pte_accessible

arch/x86/include/asm/topology.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -119,9 +119,10 @@ static inline void setup_node_to_cpumask_map(void) { } 




extern const struct cpumask *cpu_coregroup_mask(int cpu);

extern const struct cpumask *cpu_coregroup_mask(int cpu);





#ifdef ENABLE_TOPO_DEFINES

#define topology_physical_package_id(cpu)	(cpu_data(cpu).phys_proc_id)

#define topology_physical_package_id(cpu)	(cpu_data(cpu).phys_proc_id)

#define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)

#define topology_core_id(cpu)			(cpu_data(cpu).cpu_core_id)



#ifdef ENABLE_TOPO_DEFINES

#define topology_core_cpumask(cpu)		(per_cpu(cpu_core_map, cpu))

#define topology_core_cpumask(cpu)		(per_cpu(cpu_core_map, cpu))

#define topology_thread_cpumask(cpu)		(per_cpu(cpu_sibling_map, cpu))

#define topology_thread_cpumask(cpu)		(per_cpu(cpu_sibling_map, cpu))

#endif

#endif

arch/x86/xen/mmu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -365,7 +365,7 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, 
/* Assume pteval_t is equivalent to all the other *val_t types. */

/* Assume pteval_t is equivalent to all the other *val_t types. */

static pteval_t pte_mfn_to_pfn(pteval_t val)

static pteval_t pte_mfn_to_pfn(pteval_t val)

{

{

	if (pteval_present(val)) {

	if (val & _PAGE_PRESENT) {

		unsigned long mfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;

		unsigned long mfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;

		unsigned long pfn = mfn_to_pfn(mfn);

		unsigned long pfn = mfn_to_pfn(mfn);
@@ -381,7 +381,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val) 




static pteval_t pte_pfn_to_mfn(pteval_t val)

static pteval_t pte_pfn_to_mfn(pteval_t val)

{

{

	if (pteval_present(val)) {

	if (val & _PAGE_PRESENT) {

		unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;

		unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;

		pteval_t flags = val & PTE_FLAGS_MASK;

		pteval_t flags = val & PTE_FLAGS_MASK;

		unsigned long mfn;

		unsigned long mfn;

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -842,7 +842,7 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev) 
	dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,

	dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,

				       dev_priv->gtt.base.start / PAGE_SIZE,

				       dev_priv->gtt.base.start / PAGE_SIZE,

				       dev_priv->gtt.base.total / PAGE_SIZE,

				       dev_priv->gtt.base.total / PAGE_SIZE,

				       false);

				       true);

}

}





void i915_gem_restore_gtt_mappings(struct drm_device *dev)

void i915_gem_restore_gtt_mappings(struct drm_device *dev)