# git rev-parse -q --verify abfecb39092029c42c79bacac3d1c96a133ff231^{commit} abfecb39092029c42c79bacac3d1c96a133ff231 already have revision, skipping fetch # git checkout -q -f -B kisskb abfecb39092029c42c79bacac3d1c96a133ff231 # git clean -qxdf # < git log -1 # commit abfecb39092029c42c79bacac3d1c96a133ff231 # Merge: 95faf6ba654d cc8d7b4aea79 # Author: Linus Torvalds # Date: Thu Nov 4 09:09:37 2021 -0700 # # Merge tag 'tty-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty # # Pull tty / serial driver updates from Greg KH: # "Here is the big set of tty and serial driver updates for 5.16-rc1. # # Nothing major in here at all, just lots of tiny serial and tty driver # updates for various reported things, and some good cleanups. These # include: # # - more good tty api cleanups from Jiri # # - stm32 serial driver updates # # - softlockup fix for non-preempt systems under high serial load # # - rpmsg serial driver update # # - 8250 drivers updates and fixes # # - n_gsm line discipline fixes and updates as people are finally # starting to use it. # # All of these have been in linux-next for a while now with no reported # issues" # # * tag 'tty-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (86 commits) # tty: Fix extra "not" in TTY_DRIVER_REAL_RAW description # serial: cpm_uart: Protect udbg definitions by CONFIG_SERIAL_CPM_CONSOLE # tty: rpmsg: Define tty name via constant string literal # tty: rpmsg: Add pr_fmt() to prefix messages # tty: rpmsg: Use dev_err_probe() in ->probe() # tty: rpmsg: Unify variable used to keep an error code # tty: rpmsg: Assign returned id to a local variable # serial: stm32: push DMA RX data before suspending # serial: stm32: terminate / restart DMA transfer at suspend / resume # serial: stm32: rework RX dma initialization and release # serial: 8250_pci: Remove empty stub pci_quatech_exit() # serial: 8250_pci: Replace custom pci_match_id() implementation # serial: xilinx_uartps: Fix race condition causing stuck TX # serial: sunzilog: Mark sunzilog_putchar() __maybe_unused # Revert "tty: hvc: pass DMA capable memory to put_chars()" # Revert "virtio-console: remove unnecessary kmemdup()" # serial: 8250_pci: Replace dev_*() by pci_*() macros # serial: 8250_pci: Get rid of redundant 'else' keyword # serial: 8250_pci: Refactor the loop in pci_ite887x_init() # tty: add rpmsg driver # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 abfecb39092029c42c79bacac3d1c96a133ff231 # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- :1559:2: warning: #warning syscall futex_waitv not implemented [-Wcpp] In file included from : In function 'prestera_hw_build_tests', inlined from 'prestera_hw_switch_init' at /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:788:2: /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_351' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_switch_attr_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:501:9: note: in expansion of macro 'BUILD_BUG_ON' 501 | BUILD_BUG_ON(sizeof(struct prestera_msg_switch_attr_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_356' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_bridge_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:506:9: note: in expansion of macro 'BUILD_BUG_ON' 506 | BUILD_BUG_ON(sizeof(struct prestera_msg_bridge_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_358' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_bind_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:508:9: note: in expansion of macro 'BUILD_BUG_ON' 508 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_bind_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_359' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_req) != 8 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:509:9: note: in expansion of macro 'BUILD_BUG_ON' 509 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_360' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_span_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:510:9: note: in expansion of macro 'BUILD_BUG_ON' 510 | BUILD_BUG_ON(sizeof(struct prestera_msg_span_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_362' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_rxtx_req) != 8 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:512:9: note: in expansion of macro 'BUILD_BUG_ON' 512 | BUILD_BUG_ON(sizeof(struct prestera_msg_rxtx_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_363' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_lag_req) != 16 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:513:9: note: in expansion of macro 'BUILD_BUG_ON' 513 | BUILD_BUG_ON(sizeof(struct prestera_msg_lag_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_364' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_cpu_code_counter_req) != 8 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:514:9: note: in expansion of macro 'BUILD_BUG_ON' 514 | BUILD_BUG_ON(sizeof(struct prestera_msg_cpu_code_counter_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_369' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_port_info_resp) != 20 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:521:9: note: in expansion of macro 'BUILD_BUG_ON' 521 | BUILD_BUG_ON(sizeof(struct prestera_msg_port_info_resp) != 20); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_370' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_bridge_resp) != 12 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:522:9: note: in expansion of macro 'BUILD_BUG_ON' 522 | BUILD_BUG_ON(sizeof(struct prestera_msg_bridge_resp) != 12); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_373' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_resp) != 12 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:525:9: note: in expansion of macro 'BUILD_BUG_ON' 525 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_resp) != 12); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:317:45: error: call to '__compiletime_assert_374' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_span_resp) != 12 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:298:25: note: in definition of macro '__compiletime_assert' 298 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:317:9: note: in expansion of macro '_compiletime_assert' 317 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:526:9: note: in expansion of macro 'BUILD_BUG_ON' 526 | BUILD_BUG_ON(sizeof(struct prestera_msg_span_resp) != 12); | ^~~~~~~~~~~~ make[6]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/net/ethernet/marvell/prestera/prestera_hw.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet/marvell/prestera] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet/marvell] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1872: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 # Build took: 0:12:43.104905