Skip to content

Commit 43cd547

Browse files
committed
Merge: Namespace subsystem proactive fixes for RHEL 10.2
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1535 Backport all fixes in upstream Linux not found in RHEL 10.2 tree per paths in [owners.yaml](https://gitlab.com/redhat/centos-stream/src/kernel/documentation/-/blob/main/info/owners.yaml?ref_type=heads). Omitted-fix: edd3cb0 ("copy_process: pass clone_flags as u64 across calltree") * This patch modifies functions signatures tree wide and is not explicitly a fix within the scope of this backport. JIRA: https://issues.redhat.com/browse/RHEL-112480 Signed-off-by: Joel Savitz <jsavitz@redhat.com> Approved-by: Waiman Long <longman@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com>
2 parents bade22e + 495049b commit 43cd547

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

include/linux/time_namespace.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
struct user_namespace;
1313
extern struct user_namespace init_user_ns;
1414

15+
struct seq_file;
1516
struct vm_area_struct;
1617

1718
struct timens_offsets {

kernel/ucount.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ void put_ucounts(struct ucounts *ucounts)
212212
}
213213
}
214214

215-
static inline bool atomic_long_inc_below(atomic_long_t *v, int u)
215+
static inline bool atomic_long_inc_below(atomic_long_t *v, long u)
216216
{
217217
long c, old;
218218
c = atomic_long_read(v);

0 commit comments

Comments
 (0)