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

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 5954881a35ac..013e2cbe7924 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -109,7 +109,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma,
          * PTE_RDONLY is cleared by default in the asm below, so set it in
          * back if necessary (read-only or clean PTE).
          */
-        if (!pte_write(entry) || !dirty)
+        if (!pte_write(entry) || !pte_sw_dirty(entry))
                 pte_val(entry) |= PTE_RDONLY;
 
         /*
@@ -441,7 +441,7 @@ static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs)
         return 1;
 }
 
-static struct fault_info {
+static const struct fault_info {
         int     (*fn)(unsigned long addr, unsigned int esr, struct pt_regs *regs);
         int     sig;
         int     code;