tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
"Two small fixes:

- A merge error on my part broke the DocBook build. I've
requisitioned one of tglx's frozen sharks for appropriate
disciplinary action and resolved to be more careful about testing
the DocBook stuff as long as it's still around.

- Fix an error in unaligned-memory-access.txt"

* tag 'docs-4.10-rc1-fix' of git://git.lwn.net/linux:
Documentation/unaligned-memory-access.txt: fix incorrect comparison operator
docs: Fix build failure

Linus Torvalds 238d1d0f f3de082c

+2 -2
+1 -1
Documentation/DocBook/Makefile
··· 12 12 kernel-api.xml filesystems.xml lsm.xml kgdb.xml \ 13 13 gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ 14 14 genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ 15 - 80211.xml sh.xml regulator.xml w1.xml \ 15 + sh.xml regulator.xml w1.xml \ 16 16 writing_musb_glue_layer.xml iio.xml 17 17 18 18 ifeq ($(DOCBOOKS),)
+1 -1
Documentation/unaligned-memory-access.txt
··· 151 151 #else 152 152 const u16 *a = (const u16 *)addr1; 153 153 const u16 *b = (const u16 *)addr2; 154 - return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0; 154 + return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0; 155 155 #endif 156 156 } 157 157