# git rev-parse -q --verify 410da1e12ffed61129d61df5b7adce4d08c7f17c^{commit} 410da1e12ffed61129d61df5b7adce4d08c7f17c already have revision, skipping fetch # git checkout -q -f -B kisskb 410da1e12ffed61129d61df5b7adce4d08c7f17c # git clean -qxdf # < git log -1 # commit 410da1e12ffed61129d61df5b7adce4d08c7f17c # Author: Linus Torvalds # Date: Tue Jul 3 09:53:43 2018 -0700 # # net/smc: fix up merge error with poll changes # # My networking merge (commit 4e33d7d47943: "Pull networking fixes from # David Miller") got the poll() handling conflict wrong for af_smc. # # The conflict between my a11e1d432b51 ("Revert changes to convert to # ->poll_mask() and aio IOCB_CMD_POLL") and Ursula Braun's 24ac3a08e658 # ("net/smc: rebuild nonblocking connect") should have left the call to # sock_poll_wait() in place, just without the socket lock release/retake. # # And I really should have realized that. But happily, I at least asked # Ursula to double-check the merge, and she set me right. # # This also fixes an incidental whitespace issue nearby that annoyed me # while looking at this. # # Pointed-out-by: Ursula Braun # Cc: David Miller # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi-gcc --version # < git log --format=%s --max-count=1 410da1e12ffed61129d61df5b7adce4d08c7f17c # < make -s -j 48 ARCH=arm O=/kisskb/build/linus_efm32_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- efm32_defconfig # make -s -j 48 ARCH=arm O=/kisskb/build/linus_efm32_defconfig_arm CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/arm-unknown-linux-gnueabi/bin/arm-unknown-linux-gnueabi- :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:183:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:339:21: note: 'pdeo' was declared here /kisskb/src/kernel/rcu/srcutree.c: In function 'init_srcu_struct_fields': /kisskb/src/kernel/rcu/srcutree.c:127:33: warning: 'levelspread[]' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/rcu/srcutree.c:94:6: note: 'levelspread[]' was declared here /kisskb/src/net/core/gen_stats.c: In function '__gnet_stats_copy_basic': /kisskb/src/net/core/gen_stats.c:149:19: warning: 'seq' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/core/flow_dissector.c: In function '__skb_flow_dissect': /kisskb/src/net/core/flow_dissector.c:789:7: warning: 'vlan' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/core/dev.c: In function 'validate_xmit_skb_list': /kisskb/src/net/core/dev.c:3161:15: warning: 'tail' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c: In function 'rht_deferred_worker': /kisskb/src/lib/rhashtable.c:269:2: warning: 'next' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/lib/rhashtable.c:234:28: note: 'next' was declared here /kisskb/src/drivers/gpio/gpiolib-of.c: In function 'of_gpiochip_add': /kisskb/src/drivers/gpio/gpiolib-of.c:389:8: warning: 'dflags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpio/gpiolib-of.c:375:19: note: 'dflags' was declared here /kisskb/src/drivers/gpio/gpiolib-of.c:389:8: warning: 'lflags' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/gpio/gpiolib-of.c:374:25: note: 'lflags' was declared here Completed OK # rm -rf /kisskb/build/linus_efm32_defconfig_arm # Build took: 0:00:30.610400