Skip to content

Commit

Permalink
env: Update to next-20231120
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan Chancellor <[email protected]>
  • Loading branch information
nathanchance committed Nov 20, 2023
1 parent 389705b commit 04a8e31
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 35 deletions.
2 changes: 2 additions & 0 deletions fish/functions/cbl_rb_fd.fish
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ function cbl_rb_fd -d "Rebase generic Fedora kernel on latest linux-next"
for revert in $reverts
git revert --mainline 1 --no-edit $revert; or return
end
set -a b4_patches https://lore.kernel.org/all/20231116-sdhci-of-dwcmshc-fix-wbitwise-instead-of-logical-v1-1-7e1a7f4ccaab@kernel.org/ # mmc: sdhci-of-dwcmshc: Use logical OR instead of bitwise OR in dwcmshc_probe()
for patch in $b4_patches
b4 shazam -l -P _ -s $patch; or return
end
for patch in $crl_patches
crl $patch | git am -3; or return
end
set -a ln_commits d2b5fb34d3b9cebd98866a536ccf546004ca1d4c
for hash in $ln_commits
git -C $CBL_BLD_P/linux-next fp -1 --stdout $hash | git am; or return
end
Expand Down
2 changes: 2 additions & 0 deletions fish/functions/cbl_rb_pi.fish
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ function cbl_rb_pi -d "Rebase Raspberry Pi kernel on latest linux-next"
for revert in $reverts
git revert --mainline 1 --no-edit $revert; or return
end
set -a b4_patches https://lore.kernel.org/all/20231116-sdhci-of-dwcmshc-fix-wbitwise-instead-of-logical-v1-1-7e1a7f4ccaab@kernel.org/ # mmc: sdhci-of-dwcmshc: Use logical OR instead of bitwise OR in dwcmshc_probe()
for patch in $b4_patches
b4 shazam -l -P _ -s $patch; or return
end
for patch in $crl_patches
crl $patch | git am -3; or return
end
set -a ln_commits d2b5fb34d3b9cebd98866a536ccf546004ca1d4c
for hash in $ln_commits
git -C $CBL_BLD_P/linux-next fp -1 --stdout $hash | git am; or return
end
Expand Down
4 changes: 2 additions & 2 deletions pkgbuilds/linux-next-llvm/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

_localversion=-llvm
pkgname=linux-next$_localversion
_srctag=next-20231109
_srctag=next-20231120
pkgver=${_srctag//-/.}
pkgrel=1
pkgdesc='linux-next'
Expand All @@ -30,7 +30,7 @@ validpgpkeys=(
'3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB' # Mark Brown
)
sha256sums=('SKIP'
'b01e696035f42e03b608aea540c9beccecd094e5ed6e952c6e484439f642a7da')
'087f4f9b06c83d3bdeb1d6a75b6625fced58ccd35fb6bf9c2dcffee6e52fba1c')

# This obviously ties this PKGBUILD to my machine but that is kind of the point :)
_kmake() {
Expand Down
45 changes: 12 additions & 33 deletions pkgbuilds/linux-next-llvm/config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.6.0 Kernel Configuration
# Linux/x86 6.7.0-rc2 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0 (https://github.com/llvm/llvm-project f175b9647ccdfd67300264b2d3bd76e6f9a3fb93)"
CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0 (https://github.com/llvm/llvm-project 3ce5c04ad0585e5e14ba9d2f594492a257edf7b1)"
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
CONFIG_CLANG_VERSION=180000
Expand Down Expand Up @@ -760,6 +760,7 @@ CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y
CONFIG_HAVE_KVM_PM_NOTIFIER=y
CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
CONFIG_VIRTUALIZATION=y
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
Expand Down Expand Up @@ -2597,6 +2598,7 @@ CONFIG_ZRAM_DEF_COMP_ZSTD=y
# CONFIG_ZRAM_DEF_COMP_842 is not set
CONFIG_ZRAM_DEF_COMP="zstd"
CONFIG_ZRAM_WRITEBACK=y
# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
# CONFIG_ZRAM_MEMORY_TRACKING is not set
CONFIG_ZRAM_MULTI_COMP=y
CONFIG_BLK_DEV_LOOP=m
Expand Down Expand Up @@ -2624,8 +2626,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
#
# NVME Support
#
CONFIG_NVME_COMMON=m
CONFIG_NVME_AUTH=y
CONFIG_NVME_AUTH=m
CONFIG_NVME_CORE=m
CONFIG_BLK_DEV_NVME=m
CONFIG_NVME_MULTIPATH=y
Expand Down Expand Up @@ -3519,7 +3520,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STMMAC_PLATFORM=m
CONFIG_DWMAC_GENERIC=m
CONFIG_DWMAC_INTEL=m
CONFIG_DWMAC_LOONGSON=m
CONFIG_STMMAC_PCI=m
CONFIG_NET_VENDOR_SUN=y
CONFIG_HAPPYMEAL=m
Expand Down Expand Up @@ -3861,9 +3861,6 @@ CONFIG_ATH12K=m
CONFIG_ATH12K_DEBUG=y
CONFIG_ATH12K_TRACING=y
CONFIG_WLAN_VENDOR_ATMEL=y
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
CONFIG_PCMCIA_ATMEL=m
CONFIG_AT76C50X_USB=m
CONFIG_WLAN_VENDOR_BROADCOM=y
CONFIG_B43=m
Expand Down Expand Up @@ -3906,9 +3903,6 @@ CONFIG_BRCMFMAC_USB=y
CONFIG_BRCMFMAC_PCIE=y
CONFIG_BRCM_TRACING=y
CONFIG_BRCMDBG=y
CONFIG_WLAN_VENDOR_CISCO=y
CONFIG_AIRO=m
CONFIG_AIRO_CS=m
CONFIG_WLAN_VENDOR_INTEL=y
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
Expand Down Expand Up @@ -3947,22 +3941,6 @@ CONFIG_IWLWIFI_DEVICE_TRACING=y
# end of Debugging Options

CONFIG_WLAN_VENDOR_INTERSIL=y
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
CONFIG_HERMES=m
CONFIG_HERMES_PRISM=y
CONFIG_HERMES_CACHE_FW_ON_INIT=y
CONFIG_PLX_HERMES=m
CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
CONFIG_PCI_HERMES=m
CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m
CONFIG_ORINOCO_USB=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
Expand All @@ -3972,7 +3950,6 @@ CONFIG_P54_LEDS=y
CONFIG_WLAN_VENDOR_MARVELL=y
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBERTAS_CS=m
CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_SPI=m
# CONFIG_LIBERTAS_DEBUG is not set
Expand Down Expand Up @@ -4134,15 +4111,11 @@ CONFIG_WL18XX=m
CONFIG_WLCORE=m
CONFIG_WLCORE_SDIO=m
CONFIG_WLAN_VENDOR_ZYDAS=y
CONFIG_USB_ZD1201=m
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
CONFIG_WLAN_VENDOR_QUANTENNA=y
CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PCIE=m
CONFIG_PCMCIA_RAYCS=m
CONFIG_PCMCIA_WL3501=m
CONFIG_USB_NET_RNDIS_WLAN=m
CONFIG_MAC80211_HWSIM=m
CONFIG_VIRT_WIFI=m
# CONFIG_WAN is not set
Expand Down Expand Up @@ -4924,6 +4897,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_CHERRYVIEW=y
CONFIG_PINCTRL_LYNXPOINT=y
CONFIG_PINCTRL_INTEL=y
# CONFIG_PINCTRL_INTEL_PLATFORM is not set
CONFIG_PINCTRL_ALDERLAKE=y
CONFIG_PINCTRL_BROXTON=y
CONFIG_PINCTRL_CANNONLAKE=y
Expand Down Expand Up @@ -5073,6 +5047,7 @@ CONFIG_W1_CON=y
#
# 1-wire Bus Masters
#
# CONFIG_W1_MASTER_AMD_AXI is not set
CONFIG_W1_MASTER_MATROX=m
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_DS2482=m
Expand Down Expand Up @@ -5366,6 +5341,7 @@ CONFIG_SENSORS_MP2888=m
CONFIG_SENSORS_MP2975=m
CONFIG_SENSORS_MP2975_REGULATOR=y
CONFIG_SENSORS_MP5023=m
# CONFIG_SENSORS_MP5990 is not set
CONFIG_SENSORS_MPQ7932_REGULATOR=y
CONFIG_SENSORS_MPQ7932=m
CONFIG_SENSORS_PIM4328=m
Expand Down Expand Up @@ -7295,6 +7271,7 @@ CONFIG_SND_SOC_AMD_ACP_PCI=m
CONFIG_SND_AMD_ASOC_RENOIR=m
CONFIG_SND_AMD_ASOC_REMBRANDT=m
# CONFIG_SND_AMD_ASOC_ACP63 is not set
# CONFIG_SND_AMD_ASOC_ACP70 is not set
CONFIG_SND_SOC_AMD_MACH_COMMON=m
CONFIG_SND_SOC_AMD_LEGACY_MACH=m
CONFIG_SND_SOC_AMD_SOF_MACH=m
Expand Down Expand Up @@ -10114,6 +10091,7 @@ CONFIG_TSYS02D=m
CONFIG_MAX30208=m
CONFIG_MAX31856=m
CONFIG_MAX31865=m
# CONFIG_MCP9600 is not set
# end of Temperature sensors

CONFIG_NTB=m
Expand Down Expand Up @@ -10609,6 +10587,7 @@ CONFIG_NFSD_SCSILAYOUT=y
# CONFIG_NFSD_FLEXFILELAYOUT is not set
CONFIG_NFSD_V4_2_INTER_SSC=y
CONFIG_NFSD_V4_SECURITY_LABEL=y
# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
CONFIG_GRACE_PERIOD=m
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
Expand Down Expand Up @@ -10640,7 +10619,7 @@ CONFIG_CIFS_DEBUG=y
# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
CONFIG_CIFS_DFS_UPCALL=y
CONFIG_CIFS_SWN_UPCALL=y
# CONFIG_CIFS_SMB_DIRECT is not set
CONFIG_CIFS_SMB_DIRECT=y
CONFIG_CIFS_FSCACHE=y
CONFIG_SMB_SERVER=m
CONFIG_SMB_SERVER_SMBDIRECT=y
Expand Down

0 comments on commit 04a8e31

Please sign in to comment.