Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 238d1d0f authored Dec 30, 2016 by Linus Torvalds

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

parents f3de082c 36f671be

Documentation/DocBook/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \
	kernel-api.xml filesystems.xml lsm.xml kgdb.xml \		kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
	gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \		gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
	genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \		genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
	80211.xml sh.xml regulator.xml w1.xml \		sh.xml regulator.xml w1.xml \
	writing_musb_glue_layer.xml iio.xml		writing_musb_glue_layer.xml iio.xml

	ifeq ($(DOCBOOKS),)		ifeq ($(DOCBOOKS),)

Documentation/unaligned-memory-access.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 addr1, const u8 addr2)
	#else		#else
	const u16 a = (const u16 )addr1;		const u16 a = (const u16 )addr1;
	const u16 b = (const u16 )addr2;		const u16 b = (const u16 )addr2;
	return ((a[0] ^ b[0]) \| (a[1] ^ b[1]) \| (a[2] ^ b[2])) != 0;		return ((a[0] ^ b[0]) \| (a[1] ^ b[1]) \| (a[2] ^ b[2])) == 0;
	#endif		#endif
	}		}