Buildresult: linus/mmu_defconfig/microblaze-gcc5 built on Jul 4 2018, 05:19

kisskb

Revisions | Branches | Compilers | Configs | Build Results | Build Failures |

Status:	OK
Date/Time:	Jul 4 2018, 05:19
Duration:	0:00:22.430123
Builder:	ka4
Revision:	net/smc: fix up merge error with poll changes (`410da1e12ffed61129d61df5b7adce4d08c7f17c)`
Target:	linus/mmu_defconfig/microblaze-gcc5
Branch:	linus
Compiler:	microblaze-gcc5 (microblazeel-linux-gcc.br_real (Buildroot 2016.11-git-00613-ge98b4dd) 5.4.0)
Config:	mmu_defconfig (download)
Log:	Download original No warnings found in log. Full Log # 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 <torvalds@linux-foundation.org> # 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 <ubraun@linux.ibm.com> # Cc: David Miller <davem@davemloft.net> # Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> # < /opt/cross/kisskb/br-microblaze-full-2016.08-613-ge98b4dd/bin/microblazeel-linux-gcc --version # < git log --format=%s --max-count=1 410da1e12ffed61129d61df5b7adce4d08c7f17c # < make -s -j 120 ARCH=microblaze O=/kisskb/build/linus_mmu_defconfig_microblaze CROSS_COMPILE=/opt/cross/kisskb/br-microblaze-full-2016.08-613-ge98b4dd/bin/microblazeel-linux- mmu_defconfig # make -s -j 120 ARCH=microblaze O=/kisskb/build/linus_mmu_defconfig_microblaze CROSS_COMPILE=/opt/cross/kisskb/br-microblaze-full-2016.08-613-ge98b4dd/bin/microblazeel-linux- Kernel: arch/microblaze/boot/linux.bin is ready (#1) Completed OK # rm -rf /kisskb/build/linus_mmu_defconfig_microblaze # Build took: 0:00:22.430123

© Michael Ellerman 2006-2018.