linux-next: manual merge of the net-next tree with the mips tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in arch/mips/net/bpf_jit.c between commit 98fb24af5e68 ("arch/mips/net/bpf_jit.c: fix failure check") from the mips tree and commit 233577a22089 ("net: filter: constify detection of pkt_type_offset") from the net-next tree. I fi

linux-next: manual merge of the net-next tree with the mips tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in arch/mips/bcm47xx/setup.c between commits dc8db0fd9f9f ("MIPS: BCM47XX: Prepare support for LEDs"), db780310ed48 ("MIPS: BCM47XX: Prepare support for GPIO buttons") and 7fb942c59696 ("MIPS: BCM47XX: fix position of cpu_wait

linux-next: manual merge of the net-next tree with the mips tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in include/linux/ssb/ssb_driver_gige.h between commit 111bd981e221 ("MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names") from the mips tree and commit 180996c30517 ("ssb: get mac address from sprom struct for gig

linux-next: manual merge of the net-next tree with the mips tree

Hi all, Today's linux-next merge of the net-next tree got a conflict in arch/mips/include/uapi/asm/socket.h between commit c4ff4842935c ("MIPS: Whitespace cleanup") from the mips tree and commit 055dc21a1d1d ("soreuseport: infrastructure") from the net-next tree. Also, that net-next tree patch ca