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

Commit 30d0844b 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/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ae3e4562 bc867651

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 7

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*

arch/arc/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ endif 


endif



cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -fasynchronous-unwind-tables



# By default gcc 4.8 generates dwarf4 which kernel unwinder can't grok

ifeq ($(atleast_gcc48),y)

cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -gdwarf-2

arch/arc/kernel/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs, 
	 * prelogue is setup (callee regs saved and then fp set and not other

	 * way around

	 */

	pr_warn("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");

	pr_warn_once("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");

	return 0;



#endif

arch/arm/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu) 
	kvm_timer_vcpu_terminate(vcpu);

	kvm_vgic_vcpu_destroy(vcpu);

	kvm_pmu_vcpu_destroy(vcpu);

	kvm_vcpu_uninit(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}

arch/mips/include/asm/pgtable.h

+6 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct mm_struct; 
struct vm_area_struct;



#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_NO_READ | \

				 _CACHE_CACHABLE_NONCOHERENT)

				 _page_cachable_default)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_WRITE | \

				 _page_cachable_default)

#define PAGE_COPY	__pgprot(_PAGE_PRESENT | _PAGE_NO_EXEC | \
@@ -476,7 +476,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	pte.pte_low  &= (_PAGE_MODIFIED | _PAGE_ACCESSED | _PFNX_MASK);

	pte.pte_high &= (_PFN_MASK | _CACHE_MASK);

	pte.pte_low  |= pgprot_val(newprot) & ~_PFNX_MASK;

	pte.pte_high |= pgprot_val(newprot) & ~_PFN_MASK;

	pte.pte_high |= pgprot_val(newprot) & ~(_PFN_MASK | _CACHE_MASK);

	return pte;

}

#elif defined(CONFIG_PHYS_ADDR_T_64BIT) && defined(CONFIG_CPU_MIPS32)
@@ -491,7 +491,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
#else

static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)

{

	return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot));

	return __pte((pte_val(pte) & _PAGE_CHG_MASK) |

		     (pgprot_val(newprot) & ~_PAGE_CHG_MASK));

}

#endif
@@ -632,7 +633,8 @@ static inline struct page *pmd_page(pmd_t pmd) 


static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)

{

	pmd_val(pmd) = (pmd_val(pmd) & _PAGE_CHG_MASK) | pgprot_val(newprot);

	pmd_val(pmd) = (pmd_val(pmd) & _PAGE_CHG_MASK) |

		       (pgprot_val(newprot) & ~_PAGE_CHG_MASK);

	return pmd;

}