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

Commit 2a4be2c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k fixes from Geert Uytterhoeven:
 "Summary:
   - Wire up new copy_file_range syscall
   - Update defconfigs"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Update defconfigs for v4.5-rc1
  m68k: Wire up copy_file_range
parents 1926e54f daf670bc

arch/m68k/configs/amiga_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,8 @@ CONFIG_NFT_NAT=m 
CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -266,6 +268,12 @@ CONFIG_L2TP=m 
CONFIG_BRIDGE=m

CONFIG_BRIDGE=m

CONFIG_ATALK=m

CONFIG_ATALK=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m

CONFIG_6LOWPAN_GHC_UDP=m

CONFIG_6LOWPAN_GHC_ICMPV6=m

CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m

CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m

CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m

CONFIG_DNS_RESOLVER=y

CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_DAT=y
@@ -366,6 +374,7 @@ CONFIG_ARIADNE=y 
# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

CONFIG_HYDRA=y

CONFIG_HYDRA=y

CONFIG_APNE=y

CONFIG_APNE=y

CONFIG_ZORRO8390=y

CONFIG_ZORRO8390=y

arch/m68k/configs/apollo_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m 
CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -264,6 +266,12 @@ CONFIG_L2TP=m 
CONFIG_BRIDGE=m

CONFIG_BRIDGE=m

CONFIG_ATALK=m

CONFIG_ATALK=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m

CONFIG_6LOWPAN_GHC_UDP=m

CONFIG_6LOWPAN_GHC_ICMPV6=m

CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m

CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m

CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m

CONFIG_DNS_RESOLVER=y

CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_DAT=y
@@ -344,6 +352,7 @@ CONFIG_VETH=m 
# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_ROCKER is not set

arch/m68k/configs/atari_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m 
CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -264,6 +266,12 @@ CONFIG_L2TP=m 
CONFIG_BRIDGE=m

CONFIG_BRIDGE=m

CONFIG_ATALK=m

CONFIG_ATALK=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m

CONFIG_6LOWPAN_GHC_UDP=m

CONFIG_6LOWPAN_GHC_ICMPV6=m

CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m

CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m

CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m

CONFIG_DNS_RESOLVER=y

CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_DAT=y
@@ -353,6 +361,7 @@ CONFIG_ATARILANCE=y 
# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

CONFIG_NE2000=y

CONFIG_NE2000=y

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_RENESAS is not set

arch/m68k/configs/bvme6000_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,8 @@ CONFIG_NFT_NAT=m 
CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -262,6 +264,12 @@ CONFIG_L2TP=m 
CONFIG_BRIDGE=m

CONFIG_BRIDGE=m

CONFIG_ATALK=m

CONFIG_ATALK=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m

CONFIG_6LOWPAN_GHC_UDP=m

CONFIG_6LOWPAN_GHC_ICMPV6=m

CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m

CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m

CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m

CONFIG_DNS_RESOLVER=y

CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_DAT=y
@@ -343,6 +351,7 @@ CONFIG_BVME6000_NET=y 
# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_ROCKER is not set

arch/m68k/configs/hp300_defconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m 
CONFIG_NFT_QUEUE=m

CONFIG_NFT_QUEUE=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_DUP_NETDEV=m

CONFIG_NFT_FWD_NETDEV=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -264,6 +266,12 @@ CONFIG_L2TP=m 
CONFIG_BRIDGE=m

CONFIG_BRIDGE=m

CONFIG_ATALK=m

CONFIG_ATALK=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN=m

CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m

CONFIG_6LOWPAN_GHC_UDP=m

CONFIG_6LOWPAN_GHC_ICMPV6=m

CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m

CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m

CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m

CONFIG_DNS_RESOLVER=y

CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV=m

CONFIG_BATMAN_ADV_DAT=y

CONFIG_BATMAN_ADV_DAT=y
@@ -345,6 +353,7 @@ CONFIG_HPLANCE=y 
# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_RENESAS is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_ROCKER is not set