Thu Nov 30 19:42:59 2017 UTC ()
merge conflicts


(jmcneill)
diff -r1.1.1.1 -r0 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/.gitignore
diff -r1.4 -r1.5 src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h
diff -r1.1.1.1 -r0 src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f429-pinfunc.h
diff -r1.1.1.1 -r0 src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32f746-pinfunc.h
diff -r1.1.1.1 -r0 src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32h7-pinfunc.h

File Deleted: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/Attic/.gitignore

cvs diff -r1.4 -r1.5 src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h (expand / switch to unified diff)

--- src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h 2017/10/28 10:35:04 1.4
+++ src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h 2017/11/30 19:42:58 1.5
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1/* $NetBSD: linux-event-codes.h,v 1.4 2017/10/28 10:35:04 jmcneill Exp $ */ 1/* $NetBSD: linux-event-codes.h,v 1.5 2017/11/30 19:42:58 jmcneill Exp $ */
2 2
 3/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
3/* 4/*
4 * Input event codes 5 * Input event codes
5 * 6 *
6 * *** IMPORTANT *** 7 * *** IMPORTANT ***
7 * This file is not only included from C-code but also from devicetree source 8 * This file is not only included from C-code but also from devicetree source
8 * files. As such this file MUST only contain comments and defines. 9 * files. As such this file MUST only contain comments and defines.
9 * 10 *
10 * Copyright (c) 1999-2002 Vojtech Pavlik 11 * Copyright (c) 1999-2002 Vojtech Pavlik
11 * Copyright (c) 2015 Hans de Goede <hdegoede@redhat.com> 12 * Copyright (c) 2015 Hans de Goede <hdegoede@redhat.com>
12 * 13 *
13 * This program is free software; you can redistribute it and/or modify it 14 * This program is free software; you can redistribute it and/or modify it
14 * under the terms of the GNU General Public License version 2 as published by 15 * under the terms of the GNU General Public License version 2 as published by
15 * the Free Software Foundation. 16 * the Free Software Foundation.
@@ -398,26 +399,27 @@ @@ -398,26 +399,27 @@
398#define BTN_THUMBL 0x13d 399#define BTN_THUMBL 0x13d
399#define BTN_THUMBR 0x13e 400#define BTN_THUMBR 0x13e
400 401
401#define BTN_DIGI 0x140 402#define BTN_DIGI 0x140
402#define BTN_TOOL_PEN 0x140 403#define BTN_TOOL_PEN 0x140
403#define BTN_TOOL_RUBBER 0x141 404#define BTN_TOOL_RUBBER 0x141
404#define BTN_TOOL_BRUSH 0x142 405#define BTN_TOOL_BRUSH 0x142
405#define BTN_TOOL_PENCIL 0x143 406#define BTN_TOOL_PENCIL 0x143
406#define BTN_TOOL_AIRBRUSH 0x144 407#define BTN_TOOL_AIRBRUSH 0x144
407#define BTN_TOOL_FINGER 0x145 408#define BTN_TOOL_FINGER 0x145
408#define BTN_TOOL_MOUSE 0x146 409#define BTN_TOOL_MOUSE 0x146
409#define BTN_TOOL_LENS 0x147 410#define BTN_TOOL_LENS 0x147
410#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ 411#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */
 412#define BTN_STYLUS3 0x149
411#define BTN_TOUCH 0x14a 413#define BTN_TOUCH 0x14a
412#define BTN_STYLUS 0x14b 414#define BTN_STYLUS 0x14b
413#define BTN_STYLUS2 0x14c 415#define BTN_STYLUS2 0x14c
414#define BTN_TOOL_DOUBLETAP 0x14d 416#define BTN_TOOL_DOUBLETAP 0x14d
415#define BTN_TOOL_TRIPLETAP 0x14e 417#define BTN_TOOL_TRIPLETAP 0x14e
416#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */ 418#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */
417 419
418#define BTN_WHEEL 0x150 420#define BTN_WHEEL 0x150
419#define BTN_GEAR_DOWN 0x150 421#define BTN_GEAR_DOWN 0x150
420#define BTN_GEAR_UP 0x151 422#define BTN_GEAR_UP 0x151
421 423
422#define KEY_OK 0x160 424#define KEY_OK 0x160
423#define KEY_SELECT 0x161 425#define KEY_SELECT 0x161

File Deleted: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/Attic/stm32f429-pinfunc.h

File Deleted: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/Attic/stm32f746-pinfunc.h

File Deleted: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/Attic/stm32h7-pinfunc.h