summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog4
-rw-r--r--kernel-aarch64-debug-fedora.config3
-rw-r--r--kernel-aarch64-fedora.config3
-rwxr-xr-xkernel.spec17
-rw-r--r--sources6
6 files changed, 20 insertions, 15 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 57aae48c9..7d49025e6 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 150
+RHEL_RELEASE = 151
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 42a7e636c..971aa9352 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/5bd5db57713dba41e3a6df6538c4c3063aa53fb7
- 5bd5db57713dba41e3a6df6538c4c3063aa53fb7 Bluetooth: L2CAP: Try harder to accept device not knowing options
+https://gitlab.com/cki-project/kernel-ark/-/commit/f5cfdf2dfb7373853ec833e63fffff45bc9bf37d
+ f5cfdf2dfb7373853ec833e63fffff45bc9bf37d Bluetooth: L2CAP: Try harder to accept device not knowing options
https://gitlab.com/cki-project/kernel-ark/-/commit/06219afd635737bfee1a7c676258e66448f133e2
06219afd635737bfee1a7c676258e66448f133e2 ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 21114d5c4..ebb66024f 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -6625,7 +6625,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m
CONFIG_SND_SOC_QCOM=m
CONFIG_SND_SOC_QDSP6=m
CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
-# CONFIG_SND_SOC_RK3328 is not set
+CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_ROCKCHIP_I2S=m
@@ -6637,6 +6637,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
CONFIG_SND_SOC_RT1308_SDW=m
# CONFIG_SND_SOC_RT5616 is not set
# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5659=m
CONFIG_SND_SOC_RT5660=m
CONFIG_SND_SOC_RT5663=m
CONFIG_SND_SOC_RT5677=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index cc9324224..87614cacf 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -6601,7 +6601,7 @@ CONFIG_SND_SOC_PCM512x_SPI=m
CONFIG_SND_SOC_QCOM=m
CONFIG_SND_SOC_QDSP6=m
CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
-# CONFIG_SND_SOC_RK3328 is not set
+CONFIG_SND_SOC_RK3328=m
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
CONFIG_SND_SOC_RL6231=m
CONFIG_SND_SOC_ROCKCHIP_I2S=m
@@ -6613,6 +6613,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
CONFIG_SND_SOC_RT1308_SDW=m
# CONFIG_SND_SOC_RT5616 is not set
# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5659=m
CONFIG_SND_SOC_RT5660=m
CONFIG_SND_SOC_RT5663=m
CONFIG_SND_SOC_RT5677=m
diff --git a/kernel.spec b/kernel.spec
index 09ef802f7..d9bd79c76 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -64,7 +64,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc7.20210210gite0756cfc7d7c.150
+%global distro_build 0.rc7.20210212git291009f656e8.151
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -105,13 +105,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.11.0
-%define pkgrelease 0.rc7.20210210gite0756cfc7d7c.150
+%define pkgrelease 0.rc7.20210212git291009f656e8.151
# This is needed to do merge window version magic
%define patchlevel 11
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20210210gite0756cfc7d7c.150%{?buildid}%{?dist}
+%define specrelease 0.rc7.20210212git291009f656e8.151%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -602,7 +602,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210210gite0756cfc7d7c.tar.xz
+Source0: linux-20210212git291009f656e8.tar.xz
Source1: Makefile.rhelver
@@ -1250,8 +1250,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20210210gite0756cfc7d7c -c
-mv linux-20210210gite0756cfc7d7c linux-%{KVERREL}
+%setup -q -n kernel-20210212git291009f656e8 -c
+mv linux-20210212git291009f656e8 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2762,9 +2762,12 @@ fi
#
#
%changelog
-* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150]
+* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.151]
- Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)
+* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.150]
+- fedora: minor arm sound config updates (Peter Robinson)
+
* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.149]
- Fix trailing white space in redhat/configs/fedora/generic/CONFIG_SND_INTEL_BYT_PREFER_SOF (Justin M. Forbes)
- Add a redhat/rebase-notes.txt file (Hans de Goede)
diff --git a/sources b/sources
index f2c56ee06..db2b17a6a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210210gite0756cfc7d7c.tar.xz) = fa89f72e7175f26ea2f3e0439bf1488ba813ccebadbf4218f063316bcbd1333a442f1ef4ec102fac8dd434dcd4f7b15748a0ab5c0165d734caa9bbed0fad0b85
-SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = c53c44ca06406839629d1b26e561762ae3c1a73bf1122c41482817f2a631245ae01e43323e512d384006e14f5f1ee663a0092911933f293224bf958e7c6176c6
-SHA512 (kernel-kabi-dw-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = 54ea3805dd27d830da8843606c31abf2958359d6c02b348fc2b672444799a239c43103257e080a4e10034211122779fb5096875542697be138f72d8759f9f3f1
+SHA512 (linux-20210212git291009f656e8.tar.xz) = 6aa1d721fd41184a76ba94daacfd443c7efa61e9dd726db09a63db8776bfe02e9182440285f2137ed9192cca4692a08f55caebc227e934c19bb650c32fcfa55c
+SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.20210212git291009f656e8.151.tar.bz2) = 0a647f51675dc0ebc862fcd1b8b4b50decd4c348181082c9f86eceb07ee01f4990f5ecf5aadd5beb31edf300361cbf7637d09b051c59830292652a3ca1af1712
+SHA512 (kernel-kabi-dw-5.11.0-0.rc7.20210212git291009f656e8.151.tar.bz2) = 449110eaef2ac7b8414d481a20755d03f4217e42676e08fce979473641468c36680e4f3e7152c276a3df177e356d25a6ca751d29545b02d418e2fdb64d9f6425
generated by cgit (git 2.34.1) at 2024-06-24 18:18:37 +0000
>= clock->vread; vsyscall_gtod_data.clock.cycle_last = clock->cycle_last; vsyscall_gtod_data.clock.mask = clock->mask; vsyscall_gtod_data.clock.mult = clock->mult; vsyscall_gtod_data.clock.shift = clock->shift; vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec; vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags); } /* RED-PEN may want to readd seq locking, but then the variable should be * write-once. */ static __always_inline void do_get_tz(struct timezone * tz) { *tz = __vsyscall_gtod_data.sys_tz; } static __always_inline int gettimeofday(struct timeval *tv, struct timezone *tz) { int ret; asm volatile("syscall" : "=a" (ret) : "0" (__NR_gettimeofday),"D" (tv),"S" (tz) : __syscall_clobber ); return ret; } static __always_inline long time_syscall(long *t) { long secs; asm volatile("syscall" : "=a" (secs) : "0" (__NR_time),"D" (t) : __syscall_clobber); return secs; } static __always_inline void do_vgettimeofday(struct timeval * tv) { cycle_t now, base, mask, cycle_delta; unsigned seq; unsigned long mult, shift, nsec; cycle_t (*vread)(void); do { seq = read_seqbegin(&__vsyscall_gtod_data.lock); vread = __vsyscall_gtod_data.clock.vread; if (unlikely(!__vsyscall_gtod_data.sysctl_enabled || !vread)) { gettimeofday(tv,NULL); return; } now = vread(); base = __vsyscall_gtod_data.clock.cycle_last; mask = __vsyscall_gtod_data.clock.mask; mult = __vsyscall_gtod_data.clock.mult; shift = __vsyscall_gtod_data.clock.shift; tv->tv_sec = __vsyscall_gtod_data.wall_time_sec; nsec = __vsyscall_gtod_data.wall_time_nsec; } while (read_seqretry(&__vsyscall_gtod_data.lock, seq)); /* calculate interval: */ cycle_delta = (now - base) & mask; /* convert to nsecs: */ nsec += (cycle_delta * mult) >> shift; while (nsec >= NSEC_PER_SEC) { tv->tv_sec += 1; nsec -= NSEC_PER_SEC; } tv->tv_usec = nsec / NSEC_PER_USEC; } int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz) { if (tv) do_vgettimeofday(tv); if (tz) do_get_tz(tz); return 0; } /* This will break when the xtime seconds get inaccurate, but that is * unlikely */ time_t __vsyscall(1) vtime(time_t *t) { struct timeval tv; time_t result; if (unlikely(!__vsyscall_gtod_data.sysctl_enabled)) return time_syscall(t); vgettimeofday(&tv, NULL); result = tv.tv_sec; if (t) *t = result; return result; } /* Fast way to get current CPU and node. This helps to do per node and per CPU caches in user space. The result is not guaranteed without CPU affinity, but usually works out because the scheduler tries to keep a thread on the same CPU. tcache must point to a two element sized long array. All arguments can be NULL. */ long __vsyscall(2) vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache) { unsigned int p; unsigned long j = 0; /* Fast cache - only recompute value once per jiffies and avoid relatively costly rdtscp/cpuid otherwise. This works because the scheduler usually keeps the process on the same CPU and this syscall doesn't guarantee its results anyways. We do this here because otherwise user space would do it on its own in a likely inferior way (no access to jiffies). If you don't like it pass NULL. */ if (tcache && tcache->blob[0] == (j = __jiffies)) { p = tcache->blob[1]; } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ native_read_tscp(&p); } else { /* Load per CPU data from GDT */ asm("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG)); } if (tcache) { tcache->blob[0] = j; tcache->blob[1] = p; } if (cpu) *cpu = p & 0xfff; if (node) *node = p >> 12; return 0; } static long __vsyscall(3) venosys_1(void) { return -ENOSYS; } #ifdef CONFIG_SYSCTL static int vsyscall_sysctl_change(ctl_table *ctl, int write, struct file * filp, void __user *buffer, size_t *lenp, loff_t *ppos) { return proc_dointvec(ctl, write, filp, buffer, lenp, ppos); } static ctl_table kernel_table2[] = { { .procname = "vsyscall64", .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), .mode = 0644, .proc_handler = vsyscall_sysctl_change }, {} }; static ctl_table kernel_root_table2[] = { { .ctl_name = CTL_KERN, .procname = "kernel", .mode = 0555, .child = kernel_table2 }, {} }; #endif /* Assume __initcall executes before all user space. Hopefully kmod doesn't violate that. We'll find out if it does. */ static void __cpuinit vsyscall_set_cpu(int cpu) { unsigned long d; unsigned long node = 0; #ifdef CONFIG_NUMA node = cpu_to_node(cpu); #endif if (cpu_has(&cpu_data(cpu), X86_FEATURE_RDTSCP)) write_rdtscp_aux((node << 12) | cpu); /* Store cpu number in limit so that it can be loaded quickly in user space in vgetcpu. 12 bits for the CPU and 8 bits for the node. */ d = 0x0f40000000000ULL; d |= cpu; d |= (node & 0xf) << 12; d |= (node >> 4) << 48; write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_PER_CPU, &d, DESCTYPE_S); } static void __cpuinit cpu_vsyscall_init(void *arg) { /* preemption should be already off */ vsyscall_set_cpu(raw_smp_processor_id()); } static int __cpuinit cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg) { long cpu = (long)arg; if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 1); return NOTIFY_DONE; } void __init map_vsyscall(void) { extern char __vsyscall_0; unsigned long physaddr_page0 = __pa_symbol(&__vsyscall_0); /* Note that VSYSCALL_MAPPED_PAGES must agree with the code below. */ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL); } static int __init vsyscall_init(void) { BUG_ON(((unsigned long) &vgettimeofday != VSYSCALL_ADDR(__NR_vgettimeofday))); BUG_ON((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime)); BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE))); BUG_ON((unsigned long) &vgetcpu != VSYSCALL_ADDR(__NR_vgetcpu)); #ifdef CONFIG_SYSCTL register_sysctl_table(kernel_root_table2); #endif on_each_cpu(cpu_vsyscall_init, NULL, 1); hotcpu_notifier(cpu_vsyscall_notifier, 0); return 0; } __initcall(vsyscall_init);
generated by cgit (git 2.34.1) at 2024-06-24 18:18:37 +0000