From c794628d601906099e4c80d30394fe02e58db44c Mon Sep 17 00:00:00 2001 From: AlmAck Date: Mon, 12 Feb 2018 00:15:18 +0100 Subject: [PATCH] linux 4.15.2 nvidia 390.25 --- acpi_call/PKGBUILD | 2 +- acpi_call/acpi_call.install | 4 +- bbswitch/PKGBUILD | 2 +- bbswitch/bbswitch.install | 6 +- broadcom-wl/008-linux415.patch | 46 +++++++ broadcom-wl/PKGBUILD | 9 +- btrfs-progs/PKGBUILD | 2 +- linux-api-headers/PKGBUILD | 6 +- linux-tools/PKGBUILD | 4 +- linux.conf | 4 +- linux.order | 24 ++-- linux/PKGBUILD | 6 +- linux/config.x86_64 | 219 +++++++++++++++++++------------- linux/linux.install.pkg | 2 +- ndiswrapper/PKGBUILD | 9 +- ndiswrapper/linux-4.15.patch | 191 ++++++++++++++++++++++++++++ ndiswrapper/ndiswrapper.install | 2 +- nvidia-304xx-utils/PKGBUILD | 2 +- nvidia-304xx/PKGBUILD | 2 +- nvidia-304xx/nvidia.install | 6 +- nvidia-340xx-utils/PKGBUILD | 6 +- nvidia-340xx/PKGBUILD | 11 +- nvidia-340xx/kernel-4.14.patch | 29 ----- nvidia-340xx/nvidia.install | 6 +- nvidia-utils/PKGBUILD | 4 +- nvidia/4.15-FS57305.patch | 181 ++++++++++++++++++++++++++ nvidia/PKGBUILD | 10 +- nvidia/nvidia.install | 2 +- r8168/PKGBUILD | 13 +- r8168/linux-4.15.patch | 81 ++++++++++++ r8168/r8168.install | 2 +- vhba-module/PKGBUILD | 2 +- vhba-module/vhba-module.install | 4 +- 33 files changed, 713 insertions(+), 186 deletions(-) create mode 100644 broadcom-wl/008-linux415.patch create mode 100644 ndiswrapper/linux-4.15.patch delete mode 100644 nvidia-340xx/kernel-4.14.patch create mode 100644 nvidia/4.15-FS57305.patch create mode 100644 r8168/linux-4.15.patch diff --git a/acpi_call/PKGBUILD b/acpi_call/PKGBUILD index 257ac0ddc..f252bd916 100644 --- a/acpi_call/PKGBUILD +++ b/acpi_call/PKGBUILD @@ -4,7 +4,7 @@ source ../linux.conf pkgname=acpi_call _pkgname=acpi_call pkgver=1.1.0 -pkgrel=41 +pkgrel=42 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)." arch=('x86_64') url=("http://github.com/mkottman/acpi_call") diff --git a/acpi_call/acpi_call.install b/acpi_call/acpi_call.install index e242fc10d..4f42d2e4a 100755 --- a/acpi_call/acpi_call.install +++ b/acpi_call/acpi_call.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo "" echo "[+] modprobe acpi_call" @@ -12,7 +12,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/bbswitch/PKGBUILD b/bbswitch/PKGBUILD index 1dce2e765..7d8293ab5 100644 --- a/bbswitch/PKGBUILD +++ b/bbswitch/PKGBUILD @@ -3,7 +3,7 @@ source ../linux.conf pkgname=bbswitch pkgver=0.8 -pkgrel=35 +pkgrel=36 pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops" arch=('x86_64') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/bbswitch/bbswitch.install b/bbswitch/bbswitch.install index 61e5e72e9..84efbf5dd 100644 --- a/bbswitch/bbswitch.install +++ b/bbswitch/bbswitch.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/broadcom-wl/008-linux415.patch b/broadcom-wl/008-linux415.patch new file mode 100644 index 000000000..1bced2f68 --- /dev/null +++ b/broadcom-wl/008-linux415.patch @@ -0,0 +1,46 @@ +--- a/src/wl/sys/wl_linux.c 2017-07-17 00:11:24.000000000 +0100 ++++ b/src/wl/sys/wl_linux.c 2018-01-27 09:49:47.057799596 +0000 +@@ -93,7 +93,11 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void wl_timer(struct timer_list *tl); ++#else + static void wl_timer(ulong data); ++#endif + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + +@@ -2297,10 +2301,17 @@ + atomic_dec(&t->wl->callbacks); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void ++wl_timer(struct timer_list *tl) ++{ ++ wl_timer_t *t = (wl_timer_t *)tl; ++#else + static void + wl_timer(ulong data) + { + wl_timer_t *t = (wl_timer_t *)data; ++#endif + + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); +@@ -2352,9 +2363,13 @@ + + bzero(t, sizeof(wl_timer_t)); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ timer_setup(&t->timer, wl_timer, 0); ++#else + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; ++#endif + t->wl = wl; + t->fn = fn; + t->arg = arg; diff --git a/broadcom-wl/PKGBUILD b/broadcom-wl/PKGBUILD index 8a1efbd38..1fb353bd2 100644 --- a/broadcom-wl/PKGBUILD +++ b/broadcom-wl/PKGBUILD @@ -3,7 +3,7 @@ source ../linux.conf pkgname=broadcom-wl pkgver=6.30.223.271 -pkgrel=17 +pkgrel=18 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver' url='http://www.broadcom.com/support/802.11/linux_sta.php' arch=('x86_64') @@ -19,7 +19,8 @@ source=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_ '004-linux48.patch' '005-debian-fix-kernel-warnings.patch' '006-linux411.patch' - '007-linux412.patch') + '007-linux412.patch' + '008-linux415.patch') sha1sums=('1f568bb989d175813c5631c6629d9479eae6f3be' 'a37c5dd9ab279372f0c68595bb2a8f1fe694cd13' '75300b4ad9fa0f7b8ad98dfa6fbd0159a3a4c222' @@ -28,7 +29,8 @@ sha1sums=('1f568bb989d175813c5631c6629d9479eae6f3be' '7ce912f606476b61d200e1051a27c9db66fcff61' 'faca186c7c1f894240c46ffa53bece501fe58773' '4263937f6ec075b7c5461806771dd17261d56d54' - '1d3fb939df5ba3b04e2949df6c5ed24f4a3d1f48') + '1d3fb939df5ba3b04e2949df6c5ed24f4a3d1f48' + '0b14384c82fe2a511d4f0210a682871b8906ae6a') install=install @@ -42,6 +44,7 @@ prepare() { patch -p1 -i 005-debian-fix-kernel-warnings.patch patch -p1 -i 006-linux411.patch patch -p1 -i 007-linux412.patch + patch -p1 -i 008-linux415.patch sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \ -i src/wl/sys/wl_linux.c diff --git a/btrfs-progs/PKGBUILD b/btrfs-progs/PKGBUILD index 16fb8aef7..eb9292124 100644 --- a/btrfs-progs/PKGBUILD +++ b/btrfs-progs/PKGBUILD @@ -3,7 +3,7 @@ pkgname=btrfs-progs pkgver=4.14 -pkgrel=2 +pkgrel=3 pkgdesc='Btrfs filesystem utilities' arch=('x86_64') depends=('glibc' 'util-linux' 'e2fsprogs' 'lzo2' 'zlib' 'zstd') diff --git a/linux-api-headers/PKGBUILD b/linux-api-headers/PKGBUILD index 42b68c1b5..75c30b4f1 100644 --- a/linux-api-headers/PKGBUILD +++ b/linux-api-headers/PKGBUILD @@ -4,7 +4,7 @@ source ../linux.conf pkgname=linux-api-headers pkgver=$_kernelver -pkgrel=1 +pkgrel=2 pkgdesc="Kernel headers sanitized for use in userspace" arch=('x86_64') url="http://www.gnu.org/software/libc" @@ -13,9 +13,9 @@ source=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.xz http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basekernel}.tar.sign http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign) -sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7' +sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - '54a6359ed333e619db8c5c88020ff20f1e25635337f01f50a7488ec2fc0fe030' + '812499c5d0cc5183606dc9388084df162ca2eb5fa374d8f8b00136fd82825847' 'SKIP') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman diff --git a/linux-tools/PKGBUILD b/linux-tools/PKGBUILD index 87b30cef4..3303a8ef6 100644 --- a/linux-tools/PKGBUILD +++ b/linux-tools/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=linux-tools pkgname=('cgroup_event_listener' 'cpupower' 'libtraceevent' 'perf' 'tmon' 'turbostat' 'usbip' 'x86_energy_perf_policy') pkgver=${_kernelver} -pkgrel=1 +pkgrel=2 license=('GPL2') arch=('x86_64') url='http://www.kernel.org' @@ -29,7 +29,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/linux-${pkgver}.tar.xz" 'cpupower.systemd' 'cpupower.service' 'usbipd.service') -sha256sums=('ffc393a0c66f80375eacd3fb177b92e5c9daa07de0dcf947e925e049352e6142' +sha256sums=('eb6a0bc21a47c6f5c88b3de1d09f31c979a6e9b28837abe09826b6b59421039a' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' diff --git a/linux.conf b/linux.conf index 1ad0ba042..0b184459a 100644 --- a/linux.conf +++ b/linux.conf @@ -6,8 +6,8 @@ # These are the "basic variables" appliable for the normal kernel group _kernelname="-CHAKRA" -_kernelver=4.14.15 -_basekernel=4.14 +_kernelver=4.15.2 +_basekernel=4.15 _extramodules=extramodules-${_basekernel}${_kernelname} _kver="$(cat /lib/modules/${_extramodules}/version)" diff --git a/linux.order b/linux.order index 902aaa3fa..9c1a9878d 100644 --- a/linux.order +++ b/linux.order @@ -14,21 +14,21 @@ #core_packages #linux -#linux-api-headers -#linux-tools -#vhba-module -#broadcom-wl -#acpi_call +linux-api-headers +linux-tools +vhba-module +broadcom-wl +acpi_call #ndiswrapper -#btrfs-progs -#r8168 -# -#bbswitch -#nvidia-utils -#nvidia +btrfs-progs +r8168 + +bbswitch +nvidia-utils +nvidia #../lib32/lib32-nvidia-utils nvidia-304xx-utils -nvidia-304xx +#nvidia-304xx nvidia-340xx-utils nvidia-340xx diff --git a/linux/PKGBUILD b/linux/PKGBUILD index e5904f896..531d762eb 100644 --- a/linux/PKGBUILD +++ b/linux/PKGBUILD @@ -17,11 +17,11 @@ source=(http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign} config.x86_64 # standard config files for mkinitcpio ramdisk linux.preset) -sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7' +sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - '54a6359ed333e619db8c5c88020ff20f1e25635337f01f50a7488ec2fc0fe030' + '812499c5d0cc5183606dc9388084df162ca2eb5fa374d8f8b00136fd82825847' 'SKIP' - '1a3c7879bda6eadff088c75071ff344ffa682fd240a6cdfd9b14ab654c8a157d' + 'cd28fd682e578ced6f11d697057b9bcc1eff23f758e2ec1e0257516c7ba3cb87' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds diff --git a/linux/config.x86_64 b/linux/config.x86_64 index 819cf568c..845e60574 100644 --- a/linux/config.x86_64 +++ b/linux/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.15-1 Kernel Configuration +# Linux/x86 4.15.2-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -74,7 +74,6 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_FHANDLE=y # CONFIG_USELIB is not set # CONFIG_AUDIT is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y @@ -91,6 +90,8 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_MSI_IRQ=y CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y +CONFIG_GENERIC_IRQ_RESERVATION_MODE=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y @@ -127,6 +128,7 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_CPU_ISOLATION=y # # RCU Subsystem @@ -174,7 +176,6 @@ CONFIG_CGROUP_PERF=y CONFIG_CGROUP_BPF=y # CONFIG_CGROUP_DEBUG is not set CONFIG_SOCK_CGROUP_DATA=y -# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y @@ -206,11 +207,8 @@ CONFIG_MULTIUSER=y CONFIG_SGETMASK_SYSCALL=y CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set +CONFIG_FHANDLE=y CONFIG_POSIX_TIMERS=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_PRINTK=y CONFIG_PRINTK_NMI=y CONFIG_BUG=y @@ -223,13 +221,18 @@ CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y -CONFIG_BPF_SYSCALL=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y -CONFIG_USERFAULTFD=y -CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT_ALWAYS_ON=y +CONFIG_USERFAULTFD=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y # CONFIG_PC104 is not set @@ -249,7 +252,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y -# CONFIG_SYSTEM_DATA_VERIFICATION is not set +CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y @@ -351,7 +354,6 @@ CONFIG_ARCH_HAS_REFCOUNT=y # CONFIG_GCOV_KERNEL is not set CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set -CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 CONFIG_MODULES=y @@ -426,7 +428,7 @@ CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y -CONFIG_ASN1=m +CONFIG_ASN1=y CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y @@ -626,6 +628,7 @@ CONFIG_FRAME_VECTOR=y CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ARCH_HAS_PKEYS=y # CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_BENCHMARK is not set CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y @@ -639,6 +642,7 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_UMIP=y CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y CONFIG_EFI=y @@ -700,7 +704,6 @@ CONFIG_PM_ADVANCED_DEBUG=y CONFIG_PM_SLEEP_DEBUG=y CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y -CONFIG_PM_OPP=y CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y @@ -710,6 +713,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_DEBUGGER is not set +CONFIG_ACPI_LPIT=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y @@ -761,7 +765,9 @@ CONFIG_CRC_PMIC_OPREGION=y CONFIG_XPOWER_PMIC_OPREGION=y CONFIG_BXT_WC_PMIC_OPREGION=y CONFIG_CHT_WC_PMIC_OPREGION=y +CONFIG_CHT_DC_TI_PMIC_OPREGION=y CONFIG_ACPI_CONFIGFS=m +CONFIG_TPS68470_PMIC_OPREGION=y CONFIG_SFI=y # @@ -835,11 +841,11 @@ CONFIG_PCIE_PTM=y CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_QUIRKS=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_REALLOC_ENABLE_AUTO=y CONFIG_PCI_STUB=m CONFIG_XEN_PCIDEV_FRONTEND=m -CONFIG_HT_IRQ=y CONFIG_PCI_ATS=y CONFIG_PCI_LOCKLESS_CONFIG=y CONFIG_PCI_IOV=y @@ -1421,6 +1427,8 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_BRCM=y +CONFIG_NET_DSA_TAG_BRCM_PREPEND=y CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_LAN9303=y @@ -1475,6 +1483,7 @@ CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m @@ -1562,6 +1571,7 @@ CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_GENEVE=m CONFIG_VSOCKETS=m +CONFIG_VSOCKETS_DIAG=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS_COMMON=m @@ -1735,9 +1745,10 @@ CONFIG_WEXT_PRIV=y CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y +CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set -# CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_CRDA_SUPPORT=y CONFIG_CFG80211_WEXT=y CONFIG_CFG80211_WEXT_EXPORT=y @@ -1994,6 +2005,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m +CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -2022,8 +2034,13 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m + +# +# NVME Support +# CONFIG_NVME_CORE=m CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_MULTIPATH=y CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m @@ -2057,7 +2074,6 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m -# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_USB_SWITCH_FSA9480=m # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -2085,16 +2101,16 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y # CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m - -# -# Altera FPGA firmware download module -# CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m CONFIG_VMWARE_VMCI=m +# +# Intel MIC & related support +# + # # Intel MIC Bus Driver # @@ -2602,9 +2618,6 @@ CONFIG_MACB_USE_HWSTAMP=y CONFIG_MACB_PCI=m CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y CONFIG_BNX2=m CONFIG_CNIC=m CONFIG_TIGON3=m @@ -2689,6 +2702,7 @@ CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX5_CORE=m # CONFIG_MLX5_FPGA is not set CONFIG_MLX5_CORE_EN=y @@ -2749,6 +2763,7 @@ CONFIG_QED_SRIOV=y CONFIG_QEDE=m CONFIG_QED_ISCSI=y CONFIG_QED_FCOE=y +CONFIG_QED_OOO=y CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCOM_EMAC=m # CONFIG_RMNET is not set @@ -2843,6 +2858,7 @@ CONFIG_BROADCOM_PHY=m CONFIG_CICADA_PHY=m CONFIG_CORTINA_PHY=m CONFIG_DAVICOM_PHY=m +CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m CONFIG_FIXED_PHY=m @@ -2858,6 +2874,7 @@ CONFIG_MICROSEMI_PHY=m CONFIG_NATIONAL_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m +CONFIG_RENESAS_PHY=m CONFIG_ROCKCHIP_PHY=m CONFIG_SMSC_PHY=m CONFIG_STE10XP=m @@ -2994,8 +3011,6 @@ CONFIG_B43_SSB=y CONFIG_B43_BUSES_BCMA_AND_SSB=y # CONFIG_B43_BUSES_BCMA is not set # CONFIG_B43_BUSES_SSB is not set -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y @@ -3007,8 +3022,6 @@ CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y # CONFIG_B43_DEBUG is not set CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y CONFIG_B43LEGACY_LEDS=y CONFIG_B43LEGACY_HWRNG=y # CONFIG_B43LEGACY_DEBUG is not set @@ -3208,6 +3221,7 @@ CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m CONFIG_FUJITSU_ES=m +CONFIG_THUNDERBOLT_NET=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y CONFIG_ISDN_I4L=m @@ -3478,9 +3492,12 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m +CONFIG_TOUCHSCREEN_EXC3000=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m +CONFIG_TOUCHSCREEN_HIDEEP=m CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_S6SY761=m CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_EKTF2127=m CONFIG_TOUCHSCREEN_ELAN=m @@ -3569,7 +3586,6 @@ CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m CONFIG_INPUT_RETU_PWRBUTTON=m -CONFIG_INPUT_TPS65218_PWRBUTTON=m CONFIG_INPUT_AXP20X_PEK=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m @@ -3718,6 +3734,7 @@ CONFIG_HVC_XEN_FRONTEND=y CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m CONFIG_IPMI_DMI_DECODE=y +# CONFIG_IPMI_PROC_INTERFACE is not set # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m @@ -3921,10 +3938,6 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PINCTRL=y - -# -# Pin controllers -# CONFIG_PINMUX=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y @@ -3937,6 +3950,7 @@ CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_INTEL=y CONFIG_PINCTRL_BROXTON=y CONFIG_PINCTRL_CANNONLAKE=m +CONFIG_PINCTRL_CEDARFORK=m CONFIG_PINCTRL_DENVERTON=m # CONFIG_PINCTRL_GEMINILAKE is not set CONFIG_PINCTRL_LEWISBURG=m @@ -3957,6 +3971,7 @@ CONFIG_GPIO_EXAR=m # CONFIG_GPIO_GENERIC_PLATFORM is not set CONFIG_GPIO_ICH=m CONFIG_GPIO_LYNXPOINT=y +CONFIG_GPIO_MB86S7X=m # CONFIG_GPIO_MOCKUP is not set # CONFIG_GPIO_VX855 is not set @@ -3976,7 +3991,6 @@ CONFIG_GPIO_SCH311X=m # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set -# CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_TPIC2810 is not set # @@ -3986,7 +4000,6 @@ CONFIG_GPIO_SCH311X=m # CONFIG_GPIO_BD9571MWV is not set CONFIG_GPIO_CRYSTAL_COVE=y # CONFIG_GPIO_LP3943 is not set -# CONFIG_GPIO_TPS65218 is not set # CONFIG_GPIO_TPS68470 is not set # CONFIG_GPIO_UCB1400 is not set CONFIG_GPIO_WHISKEY_COVE=m @@ -4002,6 +4015,7 @@ CONFIG_GPIO_PCI_IDIO_16=m # # SPI GPIO expanders # +CONFIG_GPIO_MAX3191X=m # CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MC33880 is not set # CONFIG_GPIO_PISOSR is not set @@ -4025,6 +4039,7 @@ CONFIG_TEST_POWER=m # CONFIG_BATTERY_DS2782 is not set CONFIG_BATTERY_SBS=m CONFIG_CHARGER_SBS=m +CONFIG_MANAGER_SBS=m # CONFIG_BATTERY_BQ27XXX is not set CONFIG_CHARGER_AXP20X=m CONFIG_BATTERY_AXP20X=m @@ -4045,7 +4060,6 @@ CONFIG_CHARGER_LTC3651=m # CONFIG_CHARGER_BQ24735 is not set # CONFIG_CHARGER_BQ25890 is not set # CONFIG_CHARGER_SMB347 is not set -# CONFIG_CHARGER_TPS65217 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_CHARGER_RT9455 is not set @@ -4096,7 +4110,6 @@ CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m CONFIG_SENSORS_G762=m -CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_HIH6130=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m @@ -4121,6 +4134,7 @@ CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX31722=m +CONFIG_SENSORS_MAX6621=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m @@ -4163,6 +4177,7 @@ CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC3815=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX20751=m +CONFIG_SENSORS_MAX31785=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_TPS40422=m @@ -4336,16 +4351,11 @@ CONFIG_SSB_POSSIBLE=y CONFIG_SSB=m CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y CONFIG_SSB_PCMCIAHOST_POSSIBLE=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST_POSSIBLE=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_BCMA_POSSIBLE=y CONFIG_BCMA=m @@ -4391,6 +4401,7 @@ CONFIG_LPC_SCH=m CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SOC_PMIC_BXTWC=m CONFIG_INTEL_SOC_PMIC_CHTWC=y +CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m CONFIG_MFD_INTEL_LPSS=m CONFIG_MFD_INTEL_LPSS_ACPI=m CONFIG_MFD_INTEL_LPSS_PCI=m @@ -4439,10 +4450,8 @@ CONFIG_TPS65010=m CONFIG_TPS6507X=m # CONFIG_MFD_TPS65086 is not set # CONFIG_MFD_TPS65090 is not set -CONFIG_MFD_TPS65217=m CONFIG_MFD_TPS68470=y # CONFIG_MFD_TI_LP873X is not set -CONFIG_MFD_TPS65218=m # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set @@ -4469,6 +4478,7 @@ CONFIG_MFD_WM5110=y # CONFIG_MFD_WM8994 is not set # CONFIG_REGULATOR is not set CONFIG_CEC_CORE=m +CONFIG_CEC_PIN=y CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y @@ -4486,22 +4496,18 @@ CONFIG_IR_XMP_DECODER=m CONFIG_RC_DEVICES=y CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m -CONFIG_IR_HIX5HD2=m CONFIG_IR_IMON=m CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m CONFIG_IR_FINTEK=m CONFIG_IR_NUVOTON=m CONFIG_IR_REDRAT3=m -CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m CONFIG_IR_TTUSBIR=m CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_IR_GPIO_TX=m CONFIG_IR_SERIAL=m CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SIR=m @@ -4813,6 +4819,7 @@ CONFIG_VIDEO_VIMC=m # CONFIG_VIDEO_VIM2M is not set CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_CEC_PLATFORM_DRIVERS=y +CONFIG_CEC_GPIO=m CONFIG_SDR_PLATFORM_DRIVERS=y # @@ -5197,9 +5204,26 @@ CONFIG_DRM_AMDGPU_USERPTR=y # ACP (Audio CoProcessor) Configuration # CONFIG_DRM_AMD_ACP=y + +# +# Display Engine Configuration +# +CONFIG_DRM_AMD_DC=y +CONFIG_DRM_AMD_DC_PRE_VEGA=y +CONFIG_DRM_AMD_DC_FBC=y +CONFIG_DRM_AMD_DC_DCN1_0=y +# CONFIG_DEBUG_KERNEL_DC is not set + +# +# AMD Library routines +# +CONFIG_CHASH=m +# CONFIG_CHASH_STATS is not set +# CONFIG_CHASH_SELFTEST is not set CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +# CONFIG_NOUVEAU_DEBUG_MMU is not set CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_I915=m CONFIG_DRM_I915_ALPHA_SUPPORT=y @@ -5226,6 +5250,7 @@ CONFIG_DRM_PANEL=y # # Display Panels # +CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_BRIDGE=y CONFIG_DRM_PANEL_BRIDGE=y @@ -5343,7 +5368,6 @@ CONFIG_BACKLIGHT_APPLE=m # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_PCF50633=m # CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_TPS65217 is not set # CONFIG_BACKLIGHT_GPIO is not set # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set @@ -5560,7 +5584,9 @@ CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_TOPOLOGY=y +CONFIG_SND_SOC_ACPI=m CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m CONFIG_SND_ATMEL_SOC=m CONFIG_SND_DESIGNWARE_I2S=m CONFIG_SND_DESIGNWARE_PCM=y @@ -5586,17 +5612,20 @@ CONFIG_SND_SOC_IMG_PARALLEL_OUT=m CONFIG_SND_SOC_IMG_SPDIF_IN=m CONFIG_SND_SOC_IMG_SPDIF_OUT=m CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m CONFIG_SND_SST_IPC=m CONFIG_SND_SST_IPC_ACPI=m +CONFIG_SND_SOC_INTEL_COMMON=m CONFIG_SND_SOC_INTEL_SST=m CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m CONFIG_SND_SOC_INTEL_SST_ACPI=m -CONFIG_SND_SOC_INTEL_SST_MATCH=m +CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=m CONFIG_SND_SOC_INTEL_HASWELL=m +CONFIG_SND_SOC_INTEL_BAYTRAIL=m +CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m +CONFIG_SND_SOC_INTEL_SKYLAKE=m +CONFIG_SND_SOC_INTEL_MACH=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m -CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m -CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m @@ -5607,12 +5636,13 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m -CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m # # STMicroelectronics STM32 SOC audio support @@ -5695,6 +5725,7 @@ CONFIG_SND_SOC_RT286=m CONFIG_SND_SOC_RT298=m CONFIG_SND_SOC_RT5514=m CONFIG_SND_SOC_RT5514_SPI=m +# CONFIG_SND_SOC_RT5514_SPI_BUILTIN is not set CONFIG_SND_SOC_RT5616=m CONFIG_SND_SOC_RT5631=m CONFIG_SND_SOC_RT5640=m @@ -6111,14 +6142,13 @@ CONFIG_TAHVO_USB=m # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set CONFIG_USB_ISP1301=m # CONFIG_USB_GADGET is not set - -# -# USB Power Delivery and Type-C drivers -# CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_FUSB302=m CONFIG_TYPEC_WCOVE=m CONFIG_TYPEC_UCSI=m CONFIG_UCSI_ACPI=m +CONFIG_TYPEC_TPS6598X=m CONFIG_USB_LED_TRIG=y # CONFIG_USB_ULPI_BUS is not set CONFIG_UWB=m @@ -6180,6 +6210,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y # # LED drivers # +CONFIG_LEDS_APU=m CONFIG_LEDS_AS3645A=m CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3533=m @@ -6226,6 +6257,7 @@ CONFIG_LEDS_TRIGGER_MTD=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -6335,6 +6367,7 @@ CONFIG_RTC_DRV_ISL12022=m CONFIG_RTC_DRV_X1205=m CONFIG_RTC_DRV_PCF8523=m CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF85363=m CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_M41T80=m @@ -6519,6 +6552,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_SWIOTLB_XEN=y CONFIG_XEN_TMEM=m CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PVCALLS_FRONTEND=m # CONFIG_XEN_PVCALLS_BACKEND is not set CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_PRIVCMD=m @@ -6789,19 +6823,7 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_STAGING_MEDIA=y -CONFIG_INTEL_ATOMISP=y -CONFIG_VIDEO_ATOMISP=m -CONFIG_VIDEO_OV5693=m -CONFIG_VIDEO_IMX=m -CONFIG_VIDEO_OV2722=m -CONFIG_VIDEO_GC2235=m -CONFIG_VIDEO_OV8858=m -CONFIG_VIDEO_MSRLIST_HELPER=m -CONFIG_VIDEO_MT9M114=m -CONFIG_VIDEO_AP1302=m -CONFIG_VIDEO_GC0310=m -CONFIG_VIDEO_OV2680=m -CONFIG_VIDEO_LM3554=m +# CONFIG_INTEL_ATOMISP is not set CONFIG_I2C_BCM2048=m CONFIG_DVB_CXD2099=m CONFIG_LIRC_STAGING=y @@ -6834,9 +6856,7 @@ CONFIG_GS_FPGABOOT=m # # USB Power Delivery and Type-C drivers # -CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TCPCI=m -CONFIG_TYPEC_FUSB302=m CONFIG_DRM_VBOXVIDEO=m CONFIG_PI433=m CONFIG_X86_PLATFORM_DEVICES=y @@ -6845,8 +6865,11 @@ CONFIG_ACERHDF=m CONFIG_ALIENWARE_WMI=m CONFIG_ASUS_LAPTOP=m CONFIG_DELL_SMBIOS=m +CONFIG_DELL_SMBIOS_WMI=m +CONFIG_DELL_SMBIOS_SMM=m CONFIG_DELL_LAPTOP=m CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_DESCRIPTOR=m CONFIG_DELL_WMI_AIO=m CONFIG_DELL_WMI_LED=m CONFIG_DELL_SMO8800=m @@ -6880,6 +6903,7 @@ CONFIG_EEEPC_WMI=m CONFIG_ASUS_WIRELESS=m CONFIG_ACPI_WMI=m CONFIG_WMI_BMOF=m +CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_MSI_WMI=m CONFIG_PEAQ_WMI=m CONFIG_TOPSTAR_LAPTOP=m @@ -6888,7 +6912,6 @@ CONFIG_TOSHIBA_BT_RFKILL=m CONFIG_TOSHIBA_HAPS=m CONFIG_TOSHIBA_WMI=m CONFIG_ACPI_CMPC=m -CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_VBTN=m @@ -6935,7 +6958,7 @@ CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_NXP is not set # CONFIG_COMMON_CLK_PXA is not set # CONFIG_COMMON_CLK_PIC32 is not set -CONFIG_HWSPINLOCK=m +# CONFIG_HWSPINLOCK is not set # # Clock Source drivers @@ -6975,7 +6998,10 @@ CONFIG_REMOTEPROC=m # # Rpmsg drivers # +CONFIG_RPMSG=m +CONFIG_RPMSG_CHAR=m # CONFIG_RPMSG_QCOM_GLINK_RPM is not set +CONFIG_RPMSG_VIRTIO=m # # SOC (System On Chip) specific Drivers @@ -7052,6 +7078,7 @@ CONFIG_IIO_SW_TRIGGER=m # CONFIG_DMARD09 is not set # CONFIG_DMARD10 is not set CONFIG_HID_SENSOR_ACCEL_3D=m +CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m CONFIG_IIO_ST_ACCEL_3AXIS=m CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m @@ -7168,10 +7195,12 @@ CONFIG_IIO_ST_SENSORS_CORE=m # CONFIG_AD5791 is not set # CONFIG_AD7303 is not set # CONFIG_AD8801 is not set +# CONFIG_DS4424 is not set # CONFIG_M62332 is not set # CONFIG_MAX517 is not set # CONFIG_MCP4725 is not set # CONFIG_MCP4922 is not set +# CONFIG_TI_DAC082S085 is not set # # IIO dummy driver @@ -7356,6 +7385,7 @@ CONFIG_HID_SENSOR_PRESS=m # Proximity and distance sensors # # CONFIG_LIDAR_LITE_V2 is not set +# CONFIG_RFD77402 is not set # CONFIG_SRF04 is not set # CONFIG_SX9500 is not set # CONFIG_SRF08 is not set @@ -7373,18 +7403,23 @@ CONFIG_HID_SENSOR_TEMP=m # CONFIG_NTB is not set # CONFIG_VME_BUS is not set # CONFIG_PWM is not set + +# +# IRQ chip support +# CONFIG_ARM_GIC_MAX_NR=1 +# CONFIG_ARM_GIC_V3_ITS is not set # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_ATH79 is not set +# CONFIG_RESET_AXS10X is not set # CONFIG_RESET_BERLIN is not set # CONFIG_RESET_IMX7 is not set # CONFIG_RESET_LANTIQ is not set # CONFIG_RESET_LPC18XX is not set # CONFIG_RESET_MESON is not set # CONFIG_RESET_PISTACHIO is not set -# CONFIG_RESET_SOCFPGA is not set -# CONFIG_RESET_STM32 is not set +# CONFIG_RESET_SIMPLE is not set # CONFIG_RESET_SUNXI is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_ZYNQ is not set @@ -7452,6 +7487,7 @@ CONFIG_FSI=m CONFIG_FSI_MASTER_GPIO=m CONFIG_FSI_MASTER_HUB=m CONFIG_FSI_SCOM=m +CONFIG_PM_OPP=y # # Firmware Drivers @@ -7521,6 +7557,7 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y +CONFIG_XFS_ONLINE_SCRUB=y # CONFIG_XFS_WARN is not set # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m @@ -7537,6 +7574,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set # CONFIG_BTRFS_ASSERT is not set +# CONFIG_BTRFS_FS_REF_VERIFY is not set CONFIG_NILFS2_FS=m CONFIG_F2FS_FS=m CONFIG_F2FS_STAT_FS=y @@ -7573,6 +7611,7 @@ CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS_REDIRECT_DIR=y +# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set CONFIG_OVERLAY_FS_INDEX=y # @@ -7660,6 +7699,8 @@ CONFIG_UBIFS_ATIME_SUPPORT=y CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS_SECURITY=y CONFIG_CRAMFS=m +CONFIG_CRAMFS_BLOCKDEV=y +CONFIG_CRAMFS_MTD=y CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_FILE_CACHE is not set CONFIG_SQUASHFS_FILE_DIRECT=y @@ -7878,7 +7919,6 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACKOVERFLOW is not set -CONFIG_HAVE_ARCH_KMEMCHECK=y CONFIG_HAVE_ARCH_KASAN=y # CONFIG_KASAN is not set CONFIG_ARCH_HAS_KCOV=y @@ -7974,6 +8014,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_PREEMPTIRQ_EVENTS is not set # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y @@ -7983,7 +8024,6 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y @@ -8031,6 +8071,7 @@ CONFIG_TEST_KSTRTOX=m # CONFIG_TEST_LKM is not set # CONFIG_TEST_USER_COPY is not set # CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIND_BIT is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set @@ -8138,11 +8179,11 @@ CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=m +CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_KPP2=y CONFIG_CRYPTO_KPP=y CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_RSA=m +CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_MANAGER=y @@ -8221,6 +8262,7 @@ CONFIG_CRYPTO_SHA512_MB=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m @@ -8312,9 +8354,11 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m -CONFIG_X509_CERTIFICATE_PARSER=m -CONFIG_PKCS7_MESSAGE_PARSER=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_PKCS7_TEST_KEY is not set +CONFIG_SIGNED_PE_FILE_VERIFICATION=y # # Certificates for signature checking @@ -8363,7 +8407,6 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_IO=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_CRC_CCITT=y @@ -8438,7 +8481,7 @@ CONFIG_CORDIC=m CONFIG_DDR=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y -CONFIG_OID_REGISTRY=m +CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_FONT_SUPPORT=y CONFIG_FONTS=y diff --git a/linux/linux.install.pkg b/linux/linux.install.pkg index 4289b90e4..48ab210c4 100644 --- a/linux/linux.install.pkg +++ b/linux/linux.install.pkg @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-CHAKRA -KERNEL_VERSION=4.14.15-1-CHAKRA +KERNEL_VERSION=4.15.2-1-CHAKRA # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/ndiswrapper/PKGBUILD b/ndiswrapper/PKGBUILD index 502317190..490ad2cda 100644 --- a/ndiswrapper/PKGBUILD +++ b/ndiswrapper/PKGBUILD @@ -3,7 +3,7 @@ source ../linux.conf pkgname=ndiswrapper pkgver=1.61 -pkgrel=7 +pkgrel=8 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors. For linux-testing." license=('GPL') arch=('x86_64') @@ -17,10 +17,12 @@ conflicts=('ndiswrapper-utils') makedepends=('linux-headers') source=("http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz" 'linux-4.11.patch' - 'linux-4.13.patch') + 'linux-4.13.patch' + 'linux-4.15.patch') sha1sums=('213854ca8a83f9b5972db8fa873d346124e4bcb5' '4d1866b495a7929a3d21b6aebf0fa150702668b6' - '09b308bbc948acc59d33882524b53ce210bb1848') + '09b308bbc948acc59d33882524b53ce210bb1848' + '324a216a92b8fb7ee4f602974f81375b7e6de3c2') prepare() { [ -z "$_kver" ] && error "Could not get kernel version from '/usr/lib/modules/${_extramodules}/version'..." && false @@ -30,6 +32,7 @@ prepare() { patch -p1 -i ../linux-4.11.patch patch -p2 -i ../linux-4.13.patch + patch -p1 -i ../linux-4.15.patch sed -i -e 's|strnicmp|strncasecmp|' driver/ndis.c sed -i "/modinfo/s/s/usr\//" driver/Makefile diff --git a/ndiswrapper/linux-4.15.patch b/ndiswrapper/linux-4.15.patch new file mode 100644 index 000000000..75ad9ecde --- /dev/null +++ b/ndiswrapper/linux-4.15.patch @@ -0,0 +1,191 @@ +From eabb320dedd3d7f957e7e3604820f1f3488bbe00 Mon Sep 17 00:00:00 2001 +From: AlmAck +Date: Mon, 12 Feb 2018 00:10:24 +0100 +Subject: [PATCH] Add support for linux 4.15+ + +--- + driver/ntoskernel.c | 30 ++++++++++++++++++++++++++++-- + driver/usb.c | 2 +- + driver/wrapndis.c | 36 ++++++++++++++++++++++++++++++++++-- + 3 files changed, 63 insertions(+), 5 deletions(-) + +diff --git a/driver/ntoskernel.c b/driver/ntoskernel.c +index 4fe0dc1..1508b9d 100644 +--- a/driver/ntoskernel.c ++++ b/driver/ntoskernel.c +@@ -77,7 +77,11 @@ u64 wrap_ticks_to_boot; + #if defined(CONFIG_X86_64) + static struct timer_list shared_data_timer; + struct kuser_shared_data kuser_shared_data; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + static void update_user_shared_data_proc(unsigned long data); ++#else ++static void update_user_shared_data_proc(struct timer_list *data); ++#endif + #endif + + WIN_SYMBOL_MAP("KeTickCount", &jiffies) +@@ -91,7 +95,11 @@ DEFINE_PER_CPU(struct irql_info, irql_info); + #endif + + #if defined(CONFIG_X86_64) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + static void update_user_shared_data_proc(unsigned long data) ++#else ++static void update_user_shared_data_proc(struct timer_list * data) ++#endif + { + /* timer is supposed to be scheduled every 10ms, but bigger + * intervals seem to work (tried up to 50ms) */ +@@ -407,9 +415,19 @@ static void initialize_object(struct dispatcher_header *dh, enum dh_type type, + InitializeListHead(&dh->wait_blocks); + } + +-static void timer_proc(unsigned long data) ++static void timer_proc( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) ++ unsigned long data ++#else ++ struct timer_list * data ++#endif ++) + { +- struct wrap_timer *wrap_timer = (struct wrap_timer *)data; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) ++ struct wrap_timer *wrap_timer = (struct wrap_timer *)data; ++#else ++ struct wrap_timer *wrap_timer = from_timer(wrap_timer, data, timer); ++#endif + struct nt_timer *nt_timer; + struct kdpc *kdpc; + +@@ -452,9 +470,13 @@ void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type, + return; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + init_timer(&wrap_timer->timer); + wrap_timer->timer.data = (unsigned long)wrap_timer; + wrap_timer->timer.function = timer_proc; ++#else ++ timer_setup(&wrap_timer->timer,timer_proc,0); ++#endif + wrap_timer->nt_timer = nt_timer; + #ifdef TIMER_DEBUG + wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC; +@@ -2559,9 +2581,13 @@ int ntoskernel_init(void) + #if defined(CONFIG_X86_64) + memset(&kuser_shared_data, 0, sizeof(kuser_shared_data)); + *((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601(); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + init_timer(&shared_data_timer); + shared_data_timer.function = update_user_shared_data_proc; + shared_data_timer.data = 0; ++#else ++ timer_setup(&shared_data_timer,update_user_shared_data_proc,0); ++#endif + #endif + return 0; + } +diff --git a/driver/usb.c b/driver/usb.c +index 3e7021a..ef0dbaa 100644 +--- a/driver/usb.c ++++ b/driver/usb.c +@@ -776,7 +776,7 @@ static USBD_STATUS wrap_get_status_request(struct usb_device *udev, + return NT_URB_STATUS(nt_urb); + } + assert(status_req->transfer_buffer_length == sizeof(u16)); +- ret = usb_get_status(udev, type, status_req->index, ++ ret = usb_get_std_status(udev, type, status_req->index, + status_req->transfer_buffer); + if (ret >= 0) { + assert(ret <= status_req->transfer_buffer_length); +diff --git a/driver/wrapndis.c b/driver/wrapndis.c +index 3ce1570..704795c 100644 +--- a/driver/wrapndis.c ++++ b/driver/wrapndis.c +@@ -1089,9 +1089,19 @@ send_assoc_event: + EXIT2(return); + } + +-static void iw_stats_timer_proc(unsigned long data) ++static void iw_stats_timer_proc( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) ++ unsigned long data ++#else ++ struct timer_list * data ++#endif ++) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + struct ndis_device *wnd = (struct ndis_device *)data; ++#else ++ struct ndis_device *wnd = from_timer(wnd, data, hangcheck_timer); ++#endif + + ENTER2("%d", wnd->iw_stats_interval); + if (wnd->iw_stats_interval > 0) { +@@ -1107,8 +1117,10 @@ static void add_iw_stats_timer(struct ndis_device *wnd) + return; + if (wnd->iw_stats_interval < 0) + wnd->iw_stats_interval *= -1; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + wnd->iw_stats_timer.data = (unsigned long)wnd; + wnd->iw_stats_timer.function = iw_stats_timer_proc; ++#endif + mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval); + } + +@@ -1120,9 +1132,19 @@ static void del_iw_stats_timer(struct ndis_device *wnd) + EXIT2(return); + } + +-static void hangcheck_proc(unsigned long data) ++static void hangcheck_proc( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) ++ unsigned long data ++#else ++ struct timer_list * data ++#endif ++) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + struct ndis_device *wnd = (struct ndis_device *)data; ++#else ++ struct ndis_device *wnd = from_timer(wnd, data, hangcheck_timer); ++#endif + + ENTER3("%d", wnd->hangcheck_interval); + if (wnd->hangcheck_interval > 0) { +@@ -1143,8 +1165,10 @@ void hangcheck_add(struct ndis_device *wnd) + wnd->hangcheck_interval = hangcheck_interval * HZ; + if (wnd->hangcheck_interval < 0) + wnd->hangcheck_interval *= -1; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + wnd->hangcheck_timer.data = (unsigned long)wnd; + wnd->hangcheck_timer.function = hangcheck_proc; ++#endif + mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval); + EXIT2(return); + } +@@ -2134,9 +2158,17 @@ static NTSTATUS ndis_add_device(struct driver_object *drv_obj, + wnd->dma_map_count = 0; + wnd->dma_map_addr = NULL; + wnd->nick[0] = 0; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + init_timer(&wnd->hangcheck_timer); ++#else ++ timer_setup(&wnd->hangcheck_timer,hangcheck_proc,0); ++#endif + wnd->scan_timestamp = 0; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + init_timer(&wnd->iw_stats_timer); ++#else ++ timer_setup(&wnd->iw_stats_timer,iw_stats_timer_proc,0); ++#endif + wnd->iw_stats_interval = 10 * HZ; + wnd->ndis_pending_work = 0; + memset(&wnd->essid, 0, sizeof(wnd->essid)); +-- +2.14.2 + diff --git a/ndiswrapper/ndiswrapper.install b/ndiswrapper/ndiswrapper.install index 87701800e..dfc4e0bac 100644 --- a/ndiswrapper/ndiswrapper.install +++ b/ndiswrapper/ndiswrapper.install @@ -5,7 +5,7 @@ post_install() post_upgrade() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-304xx-utils/PKGBUILD b/nvidia-304xx-utils/PKGBUILD index db65dcb7f..23edd8152 100644 --- a/nvidia-304xx-utils/PKGBUILD +++ b/nvidia-304xx-utils/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=nvidia-304xx-utils pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx') # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx pkgver=304.137 -pkgrel=3 +pkgrel=4 arch=('x86_64') url="http://www.nvidia.com/" license=('custom') diff --git a/nvidia-304xx/PKGBUILD b/nvidia-304xx/PKGBUILD index a58e3d311..a055d9727 100644 --- a/nvidia-304xx/PKGBUILD +++ b/nvidia-304xx/PKGBUILD @@ -4,7 +4,7 @@ source ../linux.conf pkgbase=nvidia-304xx pkgname=('nvidia-304xx' 'chd-nvidia-304xx' 'nvidia-304xx-dkms') pkgver=304.137 -pkgrel=3 +pkgrel=4 arch=('x86_64') url="http://www.nvidia.com/" makedepends=("linux-headers=${_kernelver}") diff --git a/nvidia-304xx/nvidia.install b/nvidia-304xx/nvidia.install index 61e5e72e9..84efbf5dd 100644 --- a/nvidia-304xx/nvidia.install +++ b/nvidia-304xx/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-340xx-utils/PKGBUILD b/nvidia-340xx-utils/PKGBUILD index 65a4931dc..7ee601167 100644 --- a/nvidia-340xx-utils/PKGBUILD +++ b/nvidia-340xx-utils/PKGBUILD @@ -1,8 +1,8 @@ pkgbase=nvidia-340xx-utils pkgname=('nvidia-340xx-utils' 'opencl-nvidia-340xx') # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx -pkgver=340.104 -pkgrel=3 +pkgver=340.106 +pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" license=('custom') @@ -10,7 +10,7 @@ options=('!strip') _pkg="NVIDIA-Linux-${arch}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" 'nvidia-drm-outputclass.conf') -md5sums=('efbd37cde63d50f657d55a6f2b321142' +md5sums=('37c84428b64696be2b104edbc9855f57' 'a433deeb5f9cc661e537f42bde2f1df7') create_links() { diff --git a/nvidia-340xx/PKGBUILD b/nvidia-340xx/PKGBUILD index fa011b53e..ec7f38809 100644 --- a/nvidia-340xx/PKGBUILD +++ b/nvidia-340xx/PKGBUILD @@ -3,29 +3,26 @@ source ../linux.conf pkgbase=nvidia-340xx pkgname=('nvidia-340xx' 'chd-nvidia-340xx' 'nvidia-340xx-dkms') -pkgver=340.104 -pkgrel=3 +pkgver=340.106 +pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" makedepends=("linux-headers=${_kernelver}") license=('custom') source=("https://code.chakralinux.org/tools/chakra-hardware-detection/raw/master/hwdb/nvidia_supported" - 'kernel-4.11.patch' - 'kernel-4.14.patch') + 'kernel-4.11.patch') _ARCH='x86_64' _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" source+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run") md5sums=('62d0cdb856cfae64753c0f3acf729d47' 'e09208cdee41f89ae787f86c602c69d2' - 'cf9259b845e53903586c29a27de29ddb' - 'efbd37cde63d50f657d55a6f2b321142') + '37c84428b64696be2b104edbc9855f57') prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" # patches here patch -Np0 < "${srcdir}/kernel-4.11.patch" - patch -Np1 < "${srcdir}/kernel-4.14.patch" cp -a kernel kernel-dkms } diff --git a/nvidia-340xx/kernel-4.14.patch b/nvidia-340xx/kernel-4.14.patch deleted file mode 100644 index a38adbd42..000000000 --- a/nvidia-340xx/kernel-4.14.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -u -r NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c ---- NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c 2017-09-15 01:16:51.000000000 +0200 -+++ NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c 2017-11-19 00:51:45.006654148 +0100 -@@ -173,8 +173,12 @@ - { - int ret = 0; - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); -+#else - ret = drm_pci_init(&nv_drm_driver, pci_driver); - #endif -+#endif - return ret; - } - -@@ -183,8 +187,12 @@ - ) - { - #if defined(NV_DRM_AVAILABLE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) -+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); -+#else - drm_pci_exit(&nv_drm_driver, pci_driver); - #endif -+#endif - } - - RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle( diff --git a/nvidia-340xx/nvidia.install b/nvidia-340xx/nvidia.install index 935b764ed..e56f0b020 100644 --- a/nvidia-340xx/nvidia.install +++ b/nvidia-340xx/nvidia.install @@ -1,11 +1,11 @@ post_install() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo -e '\e[31;46m WARNING' echo -e '\e[31;46m If your card is from the 7xxx series or earlier, switch to nvidia-304xx' @@ -14,7 +14,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-utils/PKGBUILD b/nvidia-utils/PKGBUILD index ee94a7986..83ea583f9 100644 --- a/nvidia-utils/PKGBUILD +++ b/nvidia-utils/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=nvidia-utils pkgname=(nvidia-utils opencl-nvidia) # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx # Update nvidia-settings too -pkgver=387.34 +pkgver=390.25 pkgrel=2 arch=('x86_64') url="http://www.nvidia.com/" @@ -11,7 +11,7 @@ options=('!strip') _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" 'nvidia-drm-outputclass.conf') -md5sums=('a009bbc502c30e4b483d71be9fa51790' +md5sums=('e41e28d1f380c64ec2eacae344fb5017' 'a433deeb5f9cc661e537f42bde2f1df7') create_links() { diff --git a/nvidia/4.15-FS57305.patch b/nvidia/4.15-FS57305.patch new file mode 100644 index 000000000..723c9c378 --- /dev/null +++ b/nvidia/4.15-FS57305.patch @@ -0,0 +1,181 @@ +diff --git a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh +index 292d7da..5f254e1 100755 +--- a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh ++++ b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/conftest.sh +@@ -2123,6 +2123,7 @@ compile_test() { + #endif + #include + #include ++ #include + #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE) + #error DRM not enabled + #endif +@@ -2146,8 +2147,12 @@ compile_test() { + /* 2014-12-18 88a48e297b3a3bac6022c03babfb038f1a886cea */ + i = DRIVER_ATOMIC; + ++ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + /* 2015-04-10 df63b9994eaf942afcdb946d27a28661d7dfbf2a */ + for_each_crtc_in_state(s, c, cs, i) { } ++ #else ++ for_each_new_crtc_in_state(s, c, cs, i) {} ++ #endif + + /* 2015-05-18 036ef5733ba433760a3512bb5f7a155946e2df05 */ + a = offsetof(struct drm_mode_config_funcs, atomic_state_alloc); +diff --git a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c +index cf16b6f..a66ae5a 100644 +--- a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c ++++ b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + static void nv_drm_connector_destroy(struct drm_connector *connector) + { +@@ -87,7 +88,11 @@ static enum drm_connector_status __nv_drm_connector_detect_internal( + break; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + encoder = drm_encoder_find(dev, connector->encoder_ids[i]); ++#else ++ encoder = drm_encoder_find(dev, NULL, connector->encoder_ids[i]); ++#endif + + if (encoder == NULL) { + BUG_ON(encoder != NULL); +diff --git a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c +index b54128a..d820dc2 100644 +--- a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c ++++ b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c +@@ -37,6 +37,7 @@ + + #include + #include ++#include + + static const u32 nv_default_supported_plane_drm_formats[] = { + DRM_FORMAT_ARGB1555, +@@ -141,7 +142,11 @@ static int nv_drm_plane_atomic_check(struct drm_plane *plane, + goto done; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_crtc_in_state(plane_state->state, crtc, crtc_state, i) { ++#else ++ for_each_new_crtc_in_state(plane_state->state, crtc, crtc_state, i) { ++#endif + struct nv_drm_crtc_state *nv_crtc_state = to_nv_crtc_state(crtc_state); + struct NvKmsKapiHeadRequestedConfig *head_req_config = + &nv_crtc_state->req_config; +@@ -365,7 +370,11 @@ static int nv_drm_crtc_atomic_check(struct drm_crtc *crtc, + + req_config->flags.displaysChanged = NV_TRUE; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_connector_in_state(crtc_state->state, ++#else ++ for_each_new_connector_in_state(crtc_state->state, ++#endif + connector, connector_state, j) { + if (connector_state->crtc != crtc) { + continue; +@@ -613,7 +622,11 @@ int nv_drm_get_crtc_crc32_ioctl(struct drm_device *dev, + goto done; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + crtc = drm_crtc_find(dev, params->crtc_id); ++#else ++ crtc = drm_crtc_find(dev, NULL, params->crtc_id); ++#endif + if (!crtc) { + ret = -ENOENT; + goto done; +diff --git a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-modeset.c b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-modeset.c +index da15d89..91f64ea 100644 +--- a/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-modeset.c ++++ b/NVIDIA-Linux-x86_64-390.25-no-compat32/kernel/nvidia-drm/nvidia-drm-modeset.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + struct nv_drm_atomic_state { + struct NvKmsKapiRequestedModeSetConfig config; +@@ -110,7 +111,11 @@ nv_drm_atomic_apply_modeset_config(struct drm_device *dev, + memset(requested_config, 0, sizeof(*requested_config)); + + /* Loop over affected crtcs and construct NvKmsKapiRequestedModeSetConfig */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_crtc_in_state(state, crtc, crtc_state, i) { ++#else ++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) { ++#endif + /* + * When commiting a state, the new state is already stored in + * crtc->state. When checking a proposed state, the proposed state is +@@ -178,7 +183,11 @@ void nv_drm_atomic_helper_commit_tail(struct drm_atomic_state *state) + nv_drm_write_combine_flush(); + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_crtc_in_state(state, crtc, crtc_state, i) { ++#else ++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) { ++#endif + struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc); + struct nv_drm_crtc_state *nv_crtc_state = to_nv_crtc_state(crtc->state); + struct nv_drm_flip *nv_flip = nv_crtc_state->nv_flip; +@@ -282,7 +291,11 @@ static void nv_drm_atomic_commit_task_callback(struct work_struct *work) + ret); + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_crtc_in_state(state, crtc, crtc_state, i) { ++#else ++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) { ++#endif + struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc); + + if (wait_event_timeout( +@@ -351,7 +364,11 @@ static int nv_drm_atomic_commit_internal( + * condition between two/more nvKms->applyModeSetConfig() on single + * crtc and generate flip events in correct order. + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_crtc_in_state(state, crtc, crtc_state, i) { ++#else ++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) { ++#endif + struct nv_drm_device *nv_dev = to_nv_device(dev); + struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc); + +@@ -372,7 +389,11 @@ static int nv_drm_atomic_commit_internal( + } + } + } else { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_crtc_in_state(state, crtc, crtc_state, i) { ++#else ++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) { ++#endif + struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc); + + if (atomic_read(&nv_crtc->has_pending_commit) || +@@ -388,7 +409,11 @@ static int nv_drm_atomic_commit_internal( + * flip events. + */ + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + for_each_crtc_in_state(state, crtc, crtc_state, i) { ++#else ++ for_each_new_crtc_in_state(state, crtc, crtc_state, i) { ++#endif + struct nv_drm_crtc *nv_crtc = to_nv_crtc(crtc); + + atomic_set(&nv_crtc->has_pending_commit, true); diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 6e452d3a4..4afc94532 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -2,7 +2,7 @@ source ../linux.conf pkgname=(nvidia nvidia-dkms chd-nvidia) -pkgver=387.34 +pkgver=390.25 pkgrel=2 arch=('x86_64') url="http://www.nvidia.com/" @@ -11,14 +11,18 @@ license=('custom') options=('!strip') source=("https://code.chakralinux.org/tools/chakra-hardware-detection/raw/master/hwdb/nvidia_supported_new") _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" -source+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run") +source+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" + 4.15-FS57305.patch) sha1sums=('bdb063bbd03eed9fa718664ef2023fd759efe4a3' - '96110da0cac27da4d8ffffd8c52d825277808085') + '74c7d1ddead5af17cebe34821fb68447a34c695e' + 'b1327c1e0716dc7820cea5938fd504ee58ef1fde') prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" + patch -Np2 -i "${srcdir}"/4.15-FS57305.patch + cp -a kernel kernel-dkms cd kernel-dkms sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf diff --git a/nvidia/nvidia.install b/nvidia/nvidia.install index 4c166f3fd..80740a671 100644 --- a/nvidia/nvidia.install +++ b/nvidia/nvidia.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } diff --git a/r8168/PKGBUILD b/r8168/PKGBUILD index 2aaf56d7c..815cbff5e 100644 --- a/r8168/PKGBUILD +++ b/r8168/PKGBUILD @@ -2,7 +2,7 @@ source ../linux.conf pkgname=r8168 pkgver=8.045.08 -pkgrel=3 +pkgrel=4 pkgdesc="A kernel module for Realtek 8168 network cards" url="http://www.realtek.com.tw" license=("GPL") @@ -10,8 +10,15 @@ arch=('x86_64') depends=('glibc' "linux=${_kernelver}") makedepends=("linux-headers=${_kernelver}") install=$pkgname.install -source=("https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31') +source=("https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz" + linux-4.15.patch) +sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31' + '6434f0d1fcb08e3605a17859d3b8946c65bcf14737e223315b6468b3394c5cd7') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i ../linux-4.15.patch +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/r8168/linux-4.15.patch b/r8168/linux-4.15.patch new file mode 100644 index 000000000..a317e2253 --- /dev/null +++ b/r8168/linux-4.15.patch @@ -0,0 +1,81 @@ +diff -u -r r8168-8.045.08/src/r8168_n.c r8168-8.045.08-4.15/src/r8168_n.c +--- r8168-8.045.08/src/r8168_n.c 2017-09-22 17:31:17.000000000 +0200 ++++ r8168-8.045.08-4.15/src/r8168_n.c 2018-01-29 12:33:34.283394438 +0100 +@@ -407,8 +407,13 @@ + static void rtl8168_sleep_rx_enable(struct net_device *dev); + static void rtl8168_dsm(struct net_device *dev, int dev_state); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) + static void rtl8168_esd_timer(unsigned long __opaque); + static void rtl8168_link_timer(unsigned long __opaque); ++#else ++static void rtl8168_esd_timer(struct timer_list *timer_list); ++static void rtl8168_link_timer(struct timer_list *timer_list); ++#endif + static void rtl8168_tx_clear(struct rtl8168_private *tp); + static void rtl8168_rx_clear(struct rtl8168_private *tp); + +@@ -22964,7 +22969,11 @@ + struct rtl8168_private *tp = netdev_priv(dev); + struct timer_list *timer = &tp->esd_timer; + +- setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) ++ setup_timer(timer, rtl8168_esd_timer, (unsigned long)tp); ++#else ++ timer_setup(timer, rtl8168_esd_timer, 0); ++#endif + mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT); + } + +@@ -22978,7 +22987,11 @@ + struct rtl8168_private *tp = netdev_priv(dev); + struct timer_list *timer = &tp->link_timer; + +- setup_timer(timer, rtl8168_link_timer, (unsigned long)dev); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) ++ setup_timer(timer, rtl8168_link_timer, (unsigned long)tp); ++#else ++ timer_setup(timer, rtl8168_link_timer, 0); ++#endif + mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT); + } + +@@ -24717,10 +24730,16 @@ + #define PCI_DEVICE_SERIAL_NUMBER (0x0164) + + static void ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) + rtl8168_esd_timer(unsigned long __opaque) + { +- struct net_device *dev = (struct net_device *)__opaque; +- struct rtl8168_private *tp = netdev_priv(dev); ++ struct rtl8168_private *tp = (struct rtl8168_private *)__opaque; ++#else ++rtl8168_esd_timer(struct timer_list *timer_list) ++{ ++ struct rtl8168_private *tp = container_of(timer_list, struct rtl8168_private, esd_timer); ++#endif ++ struct net_device *dev = tp->dev; + struct pci_dev *pdev = tp->pci_dev; + struct timer_list *timer = &tp->esd_timer; + unsigned long timeout = RTL8168_ESD_TIMEOUT; +@@ -24856,10 +24875,16 @@ + } + + static void ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) + rtl8168_link_timer(unsigned long __opaque) + { +- struct net_device *dev = (struct net_device *)__opaque; +- struct rtl8168_private *tp = netdev_priv(dev); ++ struct rtl8168_private *tp = (struct rtl8168_private *)__opaque; ++#else ++rtl8168_link_timer(struct timer_list *timer_list) ++{ ++ struct rtl8168_private *tp = container_of(timer_list, struct rtl8168_private, link_timer); ++#endif ++ struct net_device *dev = tp->dev; + struct timer_list *timer = &tp->link_timer; + unsigned long flags; + diff --git a/r8168/r8168.install b/r8168/r8168.install index 8159bd8bb..f5180a972 100644 --- a/r8168/r8168.install +++ b/r8168/r8168.install @@ -1,5 +1,5 @@ rebuild_module_dependencies() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/vhba-module/PKGBUILD b/vhba-module/PKGBUILD index 00d9d267a..adc9a9b14 100644 --- a/vhba-module/PKGBUILD +++ b/vhba-module/PKGBUILD @@ -3,7 +3,7 @@ source ../linux.conf pkgname=vhba-module pkgver=20170610 -pkgrel=5 +pkgrel=6 pkgdesc="Kernel module that emulates SCSI devices" arch=('x86_64') url="http://cdemu.sourceforge.net/" diff --git a/vhba-module/vhba-module.install b/vhba-module/vhba-module.install index d1b83173e..a33914045 100644 --- a/vhba-module/vhba-module.install +++ b/vhba-module/vhba-module.install @@ -1,5 +1,5 @@ post_install() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } @@ -8,7 +8,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-4.14-CHAKRA' + EXTRAMODULES='extramodules-4.15-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) }