# 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/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 410da1e12ffed61129d61df5b7adce4d08c7f17c # < make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ppc6xx_defconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1256:20: warning: 'root' may be used uninitialized in this function [-Wuninitialized] /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/sound/ppc/awacs.c: In function 'snd_pmac_awacs_init': /kisskb/src/include/sound/control.h:223:2: warning: 'speaker_vol' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/ppc/awacs.c:886:36: note: 'speaker_vol' was declared here /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2497:6: warning: 'ret' 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/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1819:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/bridge/br_netlink.c: In function 'br_afspec': /kisskb/src/net/bridge/br_netlink.c:637:7: warning: 'err' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/dma-buf/reservation.c: In function 'reservation_object_add_shared_fence': /kisskb/src/drivers/dma-buf/reservation.c:225:6: warning: 'k' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/nfsd/nfs4xdr.c: In function 'nfsd4_encode_components_esc': /kisskb/src/fs/nfsd/nfs4xdr.c:2046:9: warning: 'str' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/udf/unicode.c: In function 'udf_name_conv_char': /kisskb/src/fs/udf/unicode.c:132:8: warning: 'c' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:251:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:231:19: note: 'i' was declared here /kisskb/src/net/mac80211/mlme.c: In function 'ieee80211_rx_mgmt_beacon': /kisskb/src/net/mac80211/mlme.c:1353:3: warning: 'pwr_level_cisco' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/net/mac80211/mlme.c:1310:6: note: 'pwr_level_cisco' was declared here /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1835:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1745:46: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] arch/powerpc/boot/mpc832x_rdb.dtb: Warning (interrupts_property): /qe@e0100000/mdio@3120/ethernet-phy@0:#interrupt-cells: size is (4), expected multiple of 8 arch/powerpc/boot/mpc832x_rdb.dtb: Warning (interrupts_property): /qe@e0100000/mdio@3120/ethernet-phy@4:#interrupt-cells: size is (4), expected multiple of 8 INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa4b1b0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa3aa8c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) INFO: Uncompressed kernel (size 0xa3aa8c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xb00000) Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4895869 Bytes = 4781.12 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b00230 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4897458 Bytes = 4782.67 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b00230 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4897625 Bytes = 4782.84 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b007a0 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4897380 Bytes = 4782.60 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b007a0 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4872092 Bytes = 4757.90 kB = 4.65 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:55 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4896845 Bytes = 4782.08 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b00230 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4897029 Bytes = 4782.25 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b00230 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4895642 Bytes = 4780.90 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b00230 Image Name: Linux-4.18.0-rc3+ Created: Wed Jul 4 06:01:56 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 4897021 Bytes = 4782.25 kB = 4.67 MB Load Address: 00b00000 Entry Point: 00b00230 Completed OK # rm -rf /kisskb/build/linus_ppc6xx_defconfig_powerpc # Build took: 0:01:13.662737