# git rev-parse -q --verify 7a7fd0de4a9804299793e564a555a49c1fc924cb^{commit} 7a7fd0de4a9804299793e564a555a49c1fc924cb already have revision, skipping fetch # git checkout -q -f -B kisskb 7a7fd0de4a9804299793e564a555a49c1fc924cb # git clean -qxdf # < git log -1 # commit 7a7fd0de4a9804299793e564a555a49c1fc924cb # Merge: c608aca57dd0 80cc83842394 # Author: Linus Torvalds # Date: Mon Mar 1 11:24:18 2021 -0800 # # Merge branch 'kmap-conversion-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux # # Pull kmap conversion updates from David Sterba: # "This contains changes regarding kmap API use and eg conversion from # kmap_atomic to kmap_local_page. # # The API belongs to memory management but to save cross-tree # dependency headaches we've agreed to take it through the btrfs tree # because there are some trivial conversions possible, while the rest # will need some time and getting the easy cases out of the way would be # convenient. # # The changes can be grouped: # # - function exports, new helpers # # - new VM_BUG_ON for additional verification; it's been discussed if # it should be VM_BUG_ON or BUG_ON, the former was chosen due to # performance reasons # # - code replaced by relevant helpers" # # [ This is an updated version of a request that originally came in during # the merge window, but I asked for some updates: # # https://lore.kernel.org/lkml/cover.1614090658.git.dsterba@suse.com/ # # which is why this got merge after the merge window closed. - Linus ] # # * 'kmap-conversion-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: # btrfs: use copy_highpage() instead of 2 kmaps() # btrfs: use memcpy_[to|from]_page() and kmap_local_page() # mm/highmem: Add VM_BUG_ON() to mem*_page() calls # mm/highmem: Introduce memcpy_page(), memmove_page(), and memset_page() # mm/highmem: Convert memcpy_[to|from]_page() to kmap_local_page() # mm/highmem: Lift memcpy_[to|from]_page to core # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 7a7fd0de4a9804299793e564a555a49c1fc924cb # < make -s -j 48 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # < make -s -j 48 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 48 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 48 ARCH=m68k O=/kisskb/build/linus_m68k-defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- /kisskb/src/arch/m68k/mvme147/config.c: In function 'mvme147_hwclk': /kisskb/src/arch/m68k/mvme147/config.c:172:2: warning: #warning check me! [-Wcpp] #warning check me! ^~~~~~~ /kisskb/src/arch/m68k/mvme16x/config.c: In function 'mvme16x_hwclk': /kisskb/src/arch/m68k/mvme16x/config.c:437:2: warning: #warning check me! [-Wcpp] #warning check me! ^~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/8390/xsurf100.c:48: /kisskb/src/drivers/net/ethernet/8390/lib8390.c:995:27: warning: '____alloc_ei_netdev' defined but not used [-Wunused-function] static struct net_device *____alloc_ei_netdev(int size) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:957:13: warning: '__ei_set_multicast_list' defined but not used [-Wunused-function] static void __ei_set_multicast_list(struct net_device *dev) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:857:33: warning: '__ei_get_stats' defined but not used [-Wunused-function] static struct net_device_stats *__ei_get_stats(struct net_device *dev) ^~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:512:13: warning: '__ei_poll' defined but not used [-Wunused-function] static void __ei_poll(struct net_device *dev) ^~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:303:20: warning: '__ei_start_xmit' defined but not used [-Wunused-function] static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:257:13: warning: '__ei_tx_timeout' defined but not used [-Wunused-function] static void __ei_tx_timeout(struct net_device *dev, unsigned int txqueue) ^~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:233:12: warning: '__ei_close' defined but not used [-Wunused-function] static int __ei_close(struct net_device *dev) ^~~~~~~~~~ /kisskb/src/drivers/net/ethernet/8390/lib8390.c:204:12: warning: '__ei_open' defined but not used [-Wunused-function] static int __ei_open(struct net_device *dev) ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_m68k-defconfig_m68k-gcc8 # Build took: 0:02:04.878614