ChangeLog:

8c457f22e kernel: fix merge derp
d59d65303 joyeuse_defconfig: regenerate
c130f05b6 Merge branch 'linux-4.14.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into S
65640c873 Linux 4.14.292
f18f62290 net: neigh: don't call kfree_skb() under spin_lock_irqsave()
