1
0

release 6.12.14

This commit is contained in:
Konstantin Demin 2025-02-17 17:51:15 +03:00
parent e0baaf49dd
commit 92542309fb
13 changed files with 51 additions and 31 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
linux (6.12.14-1) sid; urgency=medium
* New upstream stable update:
https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.14
-- Konstantin Demin <rockdrilla@gmail.com> Mon, 17 Feb 2025 17:43:08 +0300
linux (6.12.13-1) sid; urgency=medium linux (6.12.13-1) sid; urgency=medium
* New upstream stable update: * New upstream stable update:

View File

@ -722,11 +722,6 @@ CONFIG_VIRTIO_IOMMU=y
## ##
# CONFIG_IOMMUFD is not set # CONFIG_IOMMUFD is not set
##
## file: drivers/irqchip/Kconfig
##
# CONFIG_LAN966X_OIC is not set
## ##
## file: drivers/isdn/Kconfig ## file: drivers/isdn/Kconfig
## ##

View File

@ -2212,7 +2212,6 @@ CONFIG_IOMMUFD=m
## file: drivers/irqchip/Kconfig ## file: drivers/irqchip/Kconfig
## ##
# CONFIG_AL_FIC is not set # CONFIG_AL_FIC is not set
CONFIG_LAN966X_OIC=m
# CONFIG_XILINX_INTC is not set # CONFIG_XILINX_INTC is not set
## ##

View File

@ -1553,11 +1553,6 @@ CONFIG_VIRTIO_IOMMU=y
## ##
# CONFIG_IOMMUFD is not set # CONFIG_IOMMUFD is not set
##
## file: drivers/irqchip/Kconfig
##
# CONFIG_LAN966X_OIC is not set
## ##
## file: drivers/isdn/Kconfig ## file: drivers/isdn/Kconfig
## ##

View File

@ -863,6 +863,7 @@ CONFIG_PCC=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_BLK_DEV_MD=m CONFIG_BLK_DEV_MD=m
# CONFIG_MD_BITMAP_FILE is not set # CONFIG_MD_BITMAP_FILE is not set
CONFIG_MD_LINEAR=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set # CONFIG_DM_DEBUG is not set
# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set

View File

@ -37,7 +37,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
{ {
--- a/net/rose/af_rose.c --- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c +++ b/net/rose/af_rose.c
@@ -1630,7 +1630,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of @@ -1638,7 +1638,7 @@ MODULE_PARM_DESC(rose_ndevs, "number of
MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>"); MODULE_AUTHOR("Jonathan Naylor G4KLX <g4klx@g4klx.demon.co.uk>");
MODULE_DESCRIPTION("The amateur radio ROSE network layer protocol"); MODULE_DESCRIPTION("The amateur radio ROSE network layer protocol");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

View File

@ -0,0 +1,22 @@
From 2aa0cab3a568e6adccbe708ee2e79185638860ed Mon Sep 17 00:00:00 2001
From: Mike Lothian <mike@fireburn.co.uk>
Date: Fri, 14 Feb 2025 12:28:00 +0000
Subject: ntsync: Set the permissions to be 0666
This allows ntsync to be usuable by non-root processes out of the box
Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
---
drivers/misc/ntsync.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/misc/ntsync.c
+++ b/drivers/misc/ntsync.c
@@ -1206,6 +1206,7 @@ static struct miscdevice ntsync_misc = {
.minor = MISC_DYNAMIC_MINOR,
.name = NTSYNC_NAME,
.fops = &ntsync_fops,
+ .mode = 0666, // Setting file permissions to 0666
};
module_misc_device(ntsync_misc);

View File

@ -30,7 +30,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
--- a/fs/xfs/xfs_qm.c --- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c
@@ -1153,8 +1153,8 @@ xfs_qm_dqusage_adjust( @@ -1181,8 +1181,8 @@ xfs_qm_dqusage_adjust(
void *data) void *data)
{ {
struct xfs_inode *ip; struct xfs_inode *ip;
@ -41,7 +41,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
int error; int error;
ASSERT(XFS_IS_QUOTA_ON(mp)); ASSERT(XFS_IS_QUOTA_ON(mp));
@@ -1191,18 +1191,17 @@ xfs_qm_dqusage_adjust( @@ -1219,18 +1219,17 @@ xfs_qm_dqusage_adjust(
ASSERT(ip->i_delayed_blks == 0); ASSERT(ip->i_delayed_blks == 0);
@ -66,7 +66,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
/* /*
* Add the (disk blocks and inode) resources occupied by this * Add the (disk blocks and inode) resources occupied by this
@@ -1858,9 +1857,8 @@ xfs_qm_vop_chown( @@ -1892,9 +1891,8 @@ xfs_qm_vop_chown(
struct xfs_dquot *newdq) struct xfs_dquot *newdq)
{ {
struct xfs_dquot *prevdq; struct xfs_dquot *prevdq;
@ -78,7 +78,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
xfs_assert_ilocked(ip, XFS_ILOCK_EXCL); xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
ASSERT(XFS_IS_QUOTA_ON(ip->i_mount)); ASSERT(XFS_IS_QUOTA_ON(ip->i_mount));
@@ -1870,11 +1868,17 @@ xfs_qm_vop_chown( @@ -1904,11 +1902,17 @@ xfs_qm_vop_chown(
ASSERT(prevdq); ASSERT(prevdq);
ASSERT(prevdq != newdq); ASSERT(prevdq != newdq);
@ -98,7 +98,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
xfs_trans_mod_ino_dquot(tp, ip, newdq, XFS_TRANS_DQ_ICOUNT, 1); xfs_trans_mod_ino_dquot(tp, ip, newdq, XFS_TRANS_DQ_ICOUNT, 1);
/* /*
@@ -1884,7 +1888,8 @@ xfs_qm_vop_chown( @@ -1918,7 +1922,8 @@ xfs_qm_vop_chown(
* (having already bumped up the real counter) so that we don't have * (having already bumped up the real counter) so that we don't have
* any reservation to give back when we commit. * any reservation to give back when we commit.
*/ */
@ -108,7 +108,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
-ip->i_delayed_blks); -ip->i_delayed_blks);
/* /*
@@ -1896,8 +1901,13 @@ xfs_qm_vop_chown( @@ -1930,8 +1935,13 @@ xfs_qm_vop_chown(
*/ */
tp->t_flags |= XFS_TRANS_DIRTY; tp->t_flags |= XFS_TRANS_DIRTY;
xfs_dqlock(prevdq); xfs_dqlock(prevdq);
@ -126,7 +126,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
/* /*
--- a/fs/xfs/xfs_trans.c --- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c
@@ -1254,11 +1254,26 @@ retry: @@ -1261,11 +1261,26 @@ retry:
gdqp = (new_gdqp != ip->i_gdquot) ? new_gdqp : NULL; gdqp = (new_gdqp != ip->i_gdquot) ? new_gdqp : NULL;
pdqp = (new_pdqp != ip->i_pdquot) ? new_pdqp : NULL; pdqp = (new_pdqp != ip->i_pdquot) ? new_pdqp : NULL;
if (udqp || gdqp || pdqp) { if (udqp || gdqp || pdqp) {
@ -153,7 +153,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
/* /*
* Reserve enough quota to handle blocks on disk and reserved * Reserve enough quota to handle blocks on disk and reserved
* for a delayed allocation. We'll actually transfer the * for a delayed allocation. We'll actually transfer the
@@ -1266,8 +1281,20 @@ retry: @@ -1273,8 +1288,20 @@ retry:
* though that part is only semi-transactional. * though that part is only semi-transactional.
*/ */
error = xfs_trans_reserve_quota_bydquots(tp, mp, udqp, gdqp, error = xfs_trans_reserve_quota_bydquots(tp, mp, udqp, gdqp,

View File

@ -23,7 +23,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with
extern int amdgpu_gtt_size; extern int amdgpu_gtt_size;
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -136,6 +136,7 @@ enum AMDGPU_DEBUG_MASK { @@ -137,6 +137,7 @@ enum AMDGPU_DEBUG_MASK {
}; };
unsigned int amdgpu_vram_limit = UINT_MAX; unsigned int amdgpu_vram_limit = UINT_MAX;
@ -31,7 +31,7 @@ Subject: ZEN: drm/amdgpu/pm: Allow override of min_power_limit with
int amdgpu_vis_vram_limit; int amdgpu_vis_vram_limit;
int amdgpu_gart_size = -1; /* auto */ int amdgpu_gart_size = -1; /* auto */
int amdgpu_gtt_size = -1; /* auto */ int amdgpu_gtt_size = -1; /* auto */
@@ -260,6 +261,15 @@ struct amdgpu_watchdog_timer amdgpu_watc @@ -261,6 +262,15 @@ struct amdgpu_watchdog_timer amdgpu_watc
}; };
/** /**

View File

@ -102,7 +102,7 @@ Contains:
--- a/mm/vmscan.c --- a/mm/vmscan.c
+++ b/mm/vmscan.c +++ b/mm/vmscan.c
@@ -6384,7 +6384,7 @@ retry: @@ -6385,7 +6385,7 @@ retry:
return 0; return 0;
} }
@ -111,7 +111,7 @@ Contains:
{ {
struct zone *zone; struct zone *zone;
unsigned long pfmemalloc_reserve = 0; unsigned long pfmemalloc_reserve = 0;
@@ -6413,6 +6413,10 @@ static bool allow_direct_reclaim(pg_data @@ -6414,6 +6414,10 @@ static bool allow_direct_reclaim(pg_data
wmark_ok = free_pages > pfmemalloc_reserve / 2; wmark_ok = free_pages > pfmemalloc_reserve / 2;
@ -122,7 +122,7 @@ Contains:
/* kswapd must be awake if processes are being throttled */ /* kswapd must be awake if processes are being throttled */
if (!wmark_ok && waitqueue_active(&pgdat->kswapd_wait)) { if (!wmark_ok && waitqueue_active(&pgdat->kswapd_wait)) {
if (READ_ONCE(pgdat->kswapd_highest_zoneidx) > ZONE_NORMAL) if (READ_ONCE(pgdat->kswapd_highest_zoneidx) > ZONE_NORMAL)
@@ -6478,7 +6482,7 @@ static bool throttle_direct_reclaim(gfp_ @@ -6479,7 +6483,7 @@ static bool throttle_direct_reclaim(gfp_
/* Throttle based on the first usable node */ /* Throttle based on the first usable node */
pgdat = zone->zone_pgdat; pgdat = zone->zone_pgdat;
@ -131,7 +131,7 @@ Contains:
goto out; goto out;
break; break;
} }
@@ -6500,11 +6504,14 @@ static bool throttle_direct_reclaim(gfp_ @@ -6501,11 +6505,14 @@ static bool throttle_direct_reclaim(gfp_
*/ */
if (!(gfp_mask & __GFP_FS)) if (!(gfp_mask & __GFP_FS))
wait_event_interruptible_timeout(pgdat->pfmemalloc_wait, wait_event_interruptible_timeout(pgdat->pfmemalloc_wait,
@ -148,7 +148,7 @@ Contains:
if (fatal_signal_pending(current)) if (fatal_signal_pending(current))
return true; return true;
@@ -7007,14 +7014,14 @@ restart: @@ -7008,14 +7015,14 @@ restart:
* able to safely make forward progress. Wake them * able to safely make forward progress. Wake them
*/ */
if (waitqueue_active(&pgdat->pfmemalloc_wait) && if (waitqueue_active(&pgdat->pfmemalloc_wait) &&

View File

@ -20,7 +20,7 @@ Fixes: https://github.com/zen-kernel/zen-kernel/issues/282
--- a/drivers/md/dm-crypt.c --- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c
@@ -3315,6 +3315,11 @@ static int crypt_ctr(struct dm_target *t @@ -3308,6 +3308,11 @@ static int crypt_ctr(struct dm_target *t
goto bad; goto bad;
} }

View File

@ -56,7 +56,7 @@ Signed-off-by: Vinay Banakar <vny@google.com>
LIST_HEAD(ret_folios); LIST_HEAD(ret_folios);
LIST_HEAD(demote_folios); LIST_HEAD(demote_folios);
+ LIST_HEAD(pageout_list); + LIST_HEAD(pageout_list);
unsigned int nr_reclaimed = 0; unsigned int nr_reclaimed = 0, nr_demoted = 0;
unsigned int pgactivate = 0; unsigned int pgactivate = 0;
bool do_demote_pass; bool do_demote_pass;
@@ -1365,52 +1366,9 @@ retry: @@ -1365,52 +1366,9 @@ retry:
@ -190,5 +190,5 @@ Signed-off-by: Vinay Banakar <vny@google.com>
+ } + }
+ +
/* Migrate folios selected for demotion */ /* Migrate folios selected for demotion */
stat->nr_demoted = demote_folio_list(&demote_folios, pgdat); nr_demoted = demote_folio_list(&demote_folios, pgdat);
nr_reclaimed += stat->nr_demoted; nr_reclaimed += nr_demoted;

View File

@ -163,6 +163,7 @@ misc-ntsync7/0015-ntsync-Introduce-alertable-waits.patch
misc-ntsync7/0016-maintainers-Add-an-entry-for-ntsync.patch misc-ntsync7/0016-maintainers-Add-an-entry-for-ntsync.patch
misc-ntsync7/0017-docs-ntsync-Add-documentation-for-the-ntsync-uAPI.patch misc-ntsync7/0017-docs-ntsync-Add-documentation-for-the-ntsync-uAPI.patch
misc-ntsync7/0018-ntsync-No-longer-depend-on-BROKEN.patch misc-ntsync7/0018-ntsync-No-longer-depend-on-BROKEN.patch
misc-ntsync7/0019-ntsync-Set-the-permissions-to-be-0666.patch
misc-openwrt/0001-mac80211-ignore-AP-power-level-when-tx-power-type-is.patch misc-openwrt/0001-mac80211-ignore-AP-power-level-when-tx-power-type-is.patch