2014-10-06 22:22:18

by Jiri Kosina

[permalink] [raw]
Subject: [GIT PULL] doc for 3.18 merge window

Linus,

please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git for-linus

to receive

- updates to kernel documentation. I took this over (hopefully
temporarily) from Randy who was not willing to maintain it any
longer. This pile mostly is a relay of queue that Randy already had
in his tree.

----------------------------------------------------------------
Jiri Kosina (1):
MAINTAINERS: update location of linux-doc tree

Liu Hua (1):
Documentation: correct parameter error for dma_mapping_error

Mark Brown (1):
v4l2-pci-skeleton: Only build if PCI is available

Mark Rutland (1):
Docs: this_cpu_ops: remove redundant add forms

Michael Opdenacker (1):
Documentation: fix broken v4l-utils URL

Peter Foley (12):
Documentation: use subdir-y to avoid unnecessary built-in.o files
Documentation: add makefiles for more targets
Documentation: make functions static to avoid prototype warnings
Documentation: fix misc. warnings
Documentation: support glibc versions without htole macros
Documentation: update .gitignore files
Documentation: update vDSO makefile to build portable examples
Documentation: disable vdso_test to avoid breakage with old glibc
Make Documenation depend on headers_install
tools: add more endian.h macros
Documentation: remove networking/.gitignore
Documentation: update include path for mpssd

Documentation/.gitignore | 7 ---
Documentation/DMA-API-HOWTO.txt | 6 +--
Documentation/DocBook/media/v4l/common.xml | 2 +-
Documentation/Makefile | 7 +--
Documentation/accounting/Makefile | 3 --
Documentation/arm/Makefile | 1 +
Documentation/arm/SH-Mobile/.gitignore | 1 +
Documentation/arm/SH-Mobile/Makefile | 11 ++---
Documentation/arm/SH-Mobile/vrl4.c | 7 +--
Documentation/auxdisplay/Makefile | 3 --
Documentation/blackfin/Makefile | 7 +--
Documentation/filesystems/.gitignore | 1 +
Documentation/filesystems/Makefile | 3 +-
Documentation/ia64/Makefile | 3 --
Documentation/laptops/.gitignore | 2 +
Documentation/laptops/Makefile | 5 +-
Documentation/mic/Makefile | 1 +
Documentation/mic/mpssd/Makefile | 24 +++++-----
Documentation/mic/mpssd/mpssd.c | 5 +-
Documentation/misc-devices/Makefile | 1 +
Documentation/misc-devices/mei/Makefile | 3 --
Documentation/networking/.gitignore | 0
Documentation/networking/Makefile | 8 +---
Documentation/networking/timestamping/.gitignore | 1 +
Documentation/networking/timestamping/Makefile | 8 +---
Documentation/pcmcia/Makefile | 3 --
Documentation/prctl/.gitignore | 3 ++
Documentation/prctl/Makefile | 8 ++++
.../prctl/disable-tsc-ctxt-sw-stress-test.c | 11 +++--
.../prctl/disable-tsc-on-off-stress-test.c | 7 +--
Documentation/prctl/disable-tsc-test.c | 5 +-
Documentation/ptp/.gitignore | 1 +
Documentation/ptp/Makefile | 8 ++++
Documentation/ptp/testptp.c | 6 +--
Documentation/ptp/testptp.mk | 33 -------------
Documentation/spi/Makefile | 3 --
Documentation/this_cpu_ops.txt | 2 -
Documentation/timers/.gitignore | 1 +
Documentation/timers/Makefile | 3 --
Documentation/vDSO/.gitignore | 2 +
Documentation/vDSO/Makefile | 12 +++++
Documentation/video4linux/.gitignore | 1 -
Documentation/video4linux/Makefile | 1 +
Documentation/watchdog/Makefile | 1 +
Documentation/watchdog/src/Makefile | 3 --
MAINTAINERS | 1 +
Makefile | 2 +
drivers/media/rc/keymaps/Kconfig | 2 +-
drivers/media/v4l2-core/Kconfig | 9 ++++
tools/include/tools/endian.h | 56 ++++++++++++++++++++++
50 files changed, 168 insertions(+), 136 deletions(-)
delete mode 100644 Documentation/.gitignore
create mode 100644 Documentation/arm/Makefile
create mode 100644 Documentation/arm/SH-Mobile/.gitignore
create mode 100644 Documentation/filesystems/.gitignore
create mode 100644 Documentation/laptops/.gitignore
create mode 100644 Documentation/mic/Makefile
create mode 100644 Documentation/misc-devices/Makefile
delete mode 100644 Documentation/networking/.gitignore
create mode 100644 Documentation/prctl/.gitignore
create mode 100644 Documentation/prctl/Makefile
create mode 100644 Documentation/ptp/.gitignore
create mode 100644 Documentation/ptp/Makefile
delete mode 100644 Documentation/ptp/testptp.mk
create mode 100644 Documentation/timers/.gitignore
create mode 100644 Documentation/vDSO/.gitignore
create mode 100644 Documentation/vDSO/Makefile
delete mode 100644 Documentation/video4linux/.gitignore
create mode 100644 Documentation/video4linux/Makefile
create mode 100644 Documentation/watchdog/Makefile
create mode 100644 tools/include/tools/endian.h

--
Jiri Kosina
SUSE Labs


2014-10-08 16:11:48

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [GIT PULL] doc for 3.18 merge window

On Tue, 7 Oct 2014 00:22:15 +0200 (CEST)
Jiri Kosina <[email protected]> wrote:

> I took this over (hopefully temporarily) from Randy who was not willing
> to maintain it any longer.

If you like, perhaps I can take that on for a bit? There is some light
at the end of the tunnel here, and I should be able to do some
interesting things again in the near future...

jon

2014-10-10 11:29:31

by Jiri Kosina

[permalink] [raw]
Subject: Re: [GIT PULL] doc for 3.18 merge window

On Wed, 8 Oct 2014, Jonathan Corbet wrote:

> > I took this over (hopefully temporarily) from Randy who was not willing
> > to maintain it any longer.
>
> If you like, perhaps I can take that on for a bit? There is some light
> at the end of the tunnel here, and I should be able to do some
> interesting things again in the near future...

You are obviously much better fit for this position than I am, so if you
are willing to take it over, please update MAINTAINERS accordingly and
feel free to add my Acked-by: to that change.

Thanks,

--
Jiri Kosina
SUSE Labs

2014-10-20 12:45:35

by Paul Bolle

[permalink] [raw]
Subject: Re: [GIT PULL] doc for 3.18 merge window

Jiri Kosina schreef op di 07-10-2014 om 00:22 [+0200]:
> [...]
>
> Peter Foley (12):
> Documentation: use subdir-y to avoid unnecessary built-in.o files
> Documentation: add makefiles for more targets
> Documentation: make functions static to avoid prototype warnings
> Documentation: fix misc. warnings
> Documentation: support glibc versions without htole macros
> Documentation: update .gitignore files
> Documentation: update vDSO makefile to build portable examples
> Documentation: disable vdso_test to avoid breakage with old glibc
> Make Documenation depend on headers_install
> tools: add more endian.h macros
> Documentation: remove networking/.gitignore
> Documentation: update include path for mpssd

This series is included in v3.18-rc1. It broke the build of 32 bit x86
(if CONFIG_BUILD_DOCSRC is set):
Documentation/vDSO/vdso_standalone_test_x86.o: In function `to_base10':
vdso_standalone_test_x86.c:(.text+0x101): undefined reference to `__umoddi3'
vdso_standalone_test_x86.c:(.text+0x12d): undefined reference to `__udivdi3'
collect2: error: ld returned 1 exit status
make[2]: *** [Documentation/vDSO/vdso_standalone_test_x86] Error 1
make[1]: *** [Documentation/vDSO] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [vmlinux] Error 2

A possible fix is discussed in https://lkml.org/lkml/2014/10/8/538 .


Paul Bolle

2014-10-20 19:08:55

by Jiri Kosina

[permalink] [raw]
Subject: Re: [GIT PULL] doc for 3.18 merge window


[ adding Jonathan to CC ]

On Mon, 20 Oct 2014, Paul Bolle wrote:

> > Peter Foley (12):
> > Documentation: use subdir-y to avoid unnecessary built-in.o files
> > Documentation: add makefiles for more targets
> > Documentation: make functions static to avoid prototype warnings
> > Documentation: fix misc. warnings
> > Documentation: support glibc versions without htole macros
> > Documentation: update .gitignore files
> > Documentation: update vDSO makefile to build portable examples
> > Documentation: disable vdso_test to avoid breakage with old glibc
> > Make Documenation depend on headers_install
> > tools: add more endian.h macros
> > Documentation: remove networking/.gitignore
> > Documentation: update include path for mpssd
>
> This series is included in v3.18-rc1. It broke the build of 32 bit x86
> (if CONFIG_BUILD_DOCSRC is set):
> Documentation/vDSO/vdso_standalone_test_x86.o: In function `to_base10':
> vdso_standalone_test_x86.c:(.text+0x101): undefined reference to `__umoddi3'
> vdso_standalone_test_x86.c:(.text+0x12d): undefined reference to `__udivdi3'
> collect2: error: ld returned 1 exit status
> make[2]: *** [Documentation/vDSO/vdso_standalone_test_x86] Error 1
> make[1]: *** [Documentation/vDSO] Error 2
> make[1]: *** Waiting for unfinished jobs....
> make: *** [vmlinux] Error 2
>
> A possible fix is discussed in https://lkml.org/lkml/2014/10/8/538 .

Jonathan, will you take care of this (now that ad3118b9861 is in)?

BTW, I am not sure whether vdso_standalone_test_x86.c wouldn't fit better
in samples/ anyway ...

--
Jiri Kosina
SUSE Labs

2014-10-21 14:36:53

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [GIT PULL] doc for 3.18 merge window

On Mon, 20 Oct 2014 21:08:30 +0200 (CEST)
Jiri Kosina <[email protected]> wrote:

> > A possible fix is discussed in https://lkml.org/lkml/2014/10/8/538 .
>
> Jonathan, will you take care of this (now that ad3118b9861 is in)?

I'll have a look shortly, yes.

jon

2014-10-21 14:45:48

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [GIT PULL] doc for 3.18 merge window

On Mon, 20 Oct 2014 21:08:30 +0200 (CEST)
Jiri Kosina <[email protected]> wrote:

> > A possible fix is discussed in https://lkml.org/lkml/2014/10/8/538 .
>
> Jonathan, will you take care of this (now that ad3118b9861 is in)?

OK, I've applied the fix with the extra space suggested by Paul. You
should see it in the next linux-next.

jon

2014-10-24 14:11:27

by Peter Foley

[permalink] [raw]
Subject: Re: [GIT PULL] doc for 3.18 merge window

On Tue, Oct 21, 2014 at 10:45 AM, Jonathan Corbet <[email protected]> wrote:
> OK, I've applied the fix with the extra space suggested by Paul. You
> should see it in the next linux-next.

Thanks!
Sorry for not respinning my patch sooner.