Skip to content

Commit 9a08581

Browse files
committed
tgupdate: merge t/DO-NOT-MERGE-mptcp-enabled-by-default into t/upstream base
2 parents 26d310a + bafb48f commit 9a08581

File tree

280 files changed

+3402
-2045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+3402
-2045
lines changed

CREDITS

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,11 +2515,9 @@ D: SLS distribution
25152515
D: Initial implementation of VC's, pty's and select()
25162516

25172517
N: Pavel Machek
2518-
E: pavel@ucw.cz
2518+
E: pavel@kernel.org
25192519
P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
2520-
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
2521-
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2522-
D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
2520+
D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
25232521
D: Altera SoCFPGA and Nokia N900 support.
25242522
S: Czech Republic
25252523

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
Submitting patches to bcachefs:
2+
===============================
3+
4+
Patches must be tested before being submitted, either with the xfstests suite
5+
[0], or the full bcachefs test suite in ktest [1], depending on what's being
6+
touched. Note that ktest wraps xfstests and will be an easier method to running
7+
it for most users; it includes single-command wrappers for all the mainstream
8+
in-kernel local filesystems.
9+
10+
Patches will undergo more testing after being merged (including
11+
lockdep/kasan/preempt/etc. variants), these are not generally required to be
12+
run by the submitter - but do put some thought into what you're changing and
13+
which tests might be relevant, e.g. are you dealing with tricky memory layout
14+
work? kasan, are you doing locking work? then lockdep; and ktest includes
15+
single-command variants for the debug build types you'll most likely need.
16+
17+
The exception to this rule is incomplete WIP/RFC patches: if you're working on
18+
something nontrivial, it's encouraged to send out a WIP patch to let people
19+
know what you're doing and make sure you're on the right track. Just make sure
20+
it includes a brief note as to what's done and what's incomplete, to avoid
21+
confusion.
22+
23+
Rigorous checkpatch.pl adherence is not required (many of its warnings are
24+
considered out of date), but try not to deviate too much without reason.
25+
26+
Focus on writing code that reads well and is organized well; code should be
27+
aesthetically pleasing.
28+
29+
CI:
30+
===
31+
32+
Instead of running your tests locally, when running the full test suite it's
33+
prefereable to let a server farm do it in parallel, and then have the results
34+
in a nice test dashboard (which can tell you which failures are new, and
35+
presents results in a git log view, avoiding the need for most bisecting).
36+
37+
That exists [2], and community members may request an account. If you work for
38+
a big tech company, you'll need to help out with server costs to get access -
39+
but the CI is not restricted to running bcachefs tests: it runs any ktest test
40+
(which generally makes it easy to wrap other tests that can run in qemu).
41+
42+
Other things to think about:
43+
============================
44+
45+
- How will we debug this code? Is there sufficient introspection to diagnose
46+
when something starts acting wonky on a user machine?
47+
48+
We don't necessarily need every single field of every data structure visible
49+
with introspection, but having the important fields of all the core data
50+
types wired up makes debugging drastically easier - a bit of thoughtful
51+
foresight greatly reduces the need to have people build custom kernels with
52+
debug patches.
53+
54+
More broadly, think about all the debug tooling that might be needed.
55+
56+
- Does it make the codebase more or less of a mess? Can we also try to do some
57+
organizing, too?
58+
59+
- Do new tests need to be written? New assertions? How do we know and verify
60+
that the code is correct, and what happens if something goes wrong?
61+
62+
We don't yet have automated code coverage analysis or easy fault injection -
63+
but for now, pretend we did and ask what they might tell us.
64+
65+
Assertions are hugely important, given that we don't yet have a systems
66+
language that can do ergonomic embedded correctness proofs. Hitting an assert
67+
in testing is much better than wandering off into undefined behaviour la-la
68+
land - use them. Use them judiciously, and not as a replacement for proper
69+
error handling, but use them.
70+
71+
- Does it need to be performance tested? Should we add new peformance counters?
72+
73+
bcachefs has a set of persistent runtime counters which can be viewed with
74+
the 'bcachefs fs top' command; this should give users a basic idea of what
75+
their filesystem is currently doing. If you're doing a new feature or looking
76+
at old code, think if anything should be added.
77+
78+
- If it's a new on disk format feature - have upgrades and downgrades been
79+
tested? (Automated tests exists but aren't in the CI, due to the hassle of
80+
disk image management; coordinate to have them run.)
81+
82+
Mailing list, IRC:
83+
==================
84+
85+
Patches should hit the list [3], but much discussion and code review happens on
86+
IRC as well [4]; many people appreciate the more conversational approach and
87+
quicker feedback.
88+
89+
Additionally, we have a lively user community doing excellent QA work, which
90+
exists primarily on IRC. Please make use of that resource; user feedback is
91+
important for any nontrivial feature, and documenting it in commit messages
92+
would be a good idea.
93+
94+
[0]: git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git
95+
[1]: https://evilpiepirate.org/git/ktest.git/
96+
[2]: https://evilpiepirate.org/~testdashboard/ci/
97+
98+
[4]: irc.oftc.net#bcache, #bcachefs-dev

Documentation/filesystems/bcachefs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ bcachefs Documentation
99
:numbered:
1010

1111
CodingStyle
12+
SubmittingPatches
1213
errorcodes

Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-driver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ the DPSW object that it will probe:
7070
Besides the configuration of the actual DPSW object, the dpaa2-switch driver
7171
will need the following DPAA2 objects:
7272

73-
* 1 DPMCP - A Management Command Portal object is needed for any interraction
73+
* 1 DPMCP - A Management Command Portal object is needed for any interaction
7474
with the MC firmware.
7575

7676
* 1 DPBP - A Buffer Pool is used for seeding buffers intended for the Rx path

Documentation/virt/kvm/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ fetch) is injected in the guest.
14191419
S390:
14201420
^^^^^
14211421

1422-
Returns -EINVAL if the VM has the KVM_VM_S390_UCONTROL flag set.
1422+
Returns -EINVAL or -EEXIST if the VM has the KVM_VM_S390_UCONTROL flag set.
14231423
Returns -EINVAL if called on a protected VM.
14241424

14251425
4.36 KVM_SET_TSS_ADDR

MAINTAINERS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,6 @@ F: sound/soc/codecs/cs42l84.*
22092209
F: sound/soc/codecs/ssm3515.c
22102210

22112211
ARM/APPLE MACHINE SUPPORT
2212-
M: Hector Martin <[email protected]>
22132212
M: Sven Peter <[email protected]>
22142213
R: Alyssa Rosenzweig <[email protected]>
22152214
@@ -3954,6 +3953,7 @@ M: Kent Overstreet <[email protected]>
39543953
39553954
S: Supported
39563955
C: irc://irc.oftc.net/bcache
3956+
P: Documentation/filesystems/bcachefs/SubmittingPatches.rst
39573957
T: git https://evilpiepirate.org/git/bcachefs.git
39583958
F: fs/bcachefs/
39593959
F: Documentation/filesystems/bcachefs/
@@ -9417,7 +9417,7 @@ F: fs/freevxfs/
94179417

94189418
FREEZER
94199419
M: "Rafael J. Wysocki" <[email protected]>
9420-
M: Pavel Machek <pavel@ucw.cz>
9420+
M: Pavel Machek <pavel@kernel.org>
94219421
94229422
S: Supported
94239423
F: Documentation/power/freezing-of-tasks.rst
@@ -9877,7 +9877,7 @@ S: Maintained
98779877
F: drivers/staging/gpib/
98789878

98799879
GPIO ACPI SUPPORT
9880-
M: Mika Westerberg <[email protected]>
9880+
M: Mika Westerberg <[email protected]>
98819881
M: Andy Shevchenko <[email protected]>
98829882
98839883
@@ -10252,7 +10252,7 @@ F: drivers/video/fbdev/hgafb.c
1025210252

1025310253
HIBERNATION (aka Software Suspend, aka swsusp)
1025410254
M: "Rafael J. Wysocki" <[email protected]>
10255-
M: Pavel Machek <pavel@ucw.cz>
10255+
M: Pavel Machek <pavel@kernel.org>
1025610256
1025710257
S: Supported
1025810258
B: https://bugzilla.kernel.org
@@ -13123,8 +13123,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/har
1312313123
F: scripts/leaking_addresses.pl
1312413124

1312513125
LED SUBSYSTEM
13126-
M: Pavel Machek <[email protected]>
1312713126
M: Lee Jones <[email protected]>
13127+
M: Pavel Machek <[email protected]>
1312813128
1312913129
S: Maintained
1313013130
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git
@@ -16824,7 +16824,7 @@ F: include/linux/tick.h
1682416824
F: kernel/time/tick*.*
1682516825

1682616826
NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
16827-
M: Pavel Machek <pavel@ucw.cz>
16827+
M: Pavel Machek <pavel@kernel.org>
1682816828
M: Sakari Ailus <[email protected]>
1682916829
1683016830
S: Maintained
@@ -22847,7 +22847,7 @@ F: drivers/sh/
2284722847
SUSPEND TO RAM
2284822848
M: "Rafael J. Wysocki" <[email protected]>
2284922849
M: Len Brown <[email protected]>
22850-
M: Pavel Machek <pavel@ucw.cz>
22850+
M: Pavel Machek <pavel@kernel.org>
2285122851
2285222852
S: Supported
2285322853
B: https://bugzilla.kernel.org

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 14
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

arch/alpha/include/asm/elf.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
7474
/*
7575
* This is used to ensure we don't load something for the wrong architecture.
7676
*/
77-
#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
77+
#define elf_check_arch(x) (((x)->e_machine == EM_ALPHA) && !((x)->e_flags & EF_ALPHA_32BIT))
7878

7979
/*
8080
* These are used to set parameters in the core dumps.
@@ -137,10 +137,6 @@ extern int dump_elf_task(elf_greg_t *dest, struct task_struct *task);
137137
: amask (AMASK_CIX) ? "ev6" : "ev67"); \
138138
})
139139

140-
#define SET_PERSONALITY(EX) \
141-
set_personality(((EX).e_flags & EF_ALPHA_32BIT) \
142-
? PER_LINUX_32BIT : PER_LINUX)
143-
144140
extern int alpha_l1i_cacheshape;
145141
extern int alpha_l1d_cacheshape;
146142
extern int alpha_l2_cacheshape;

arch/alpha/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
360360

361361
extern void paging_init(void);
362362

363-
/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */
363+
/* We have our own get_unmapped_area */
364364
#define HAVE_ARCH_UNMAPPED_AREA
365365

366366
#endif /* _ALPHA_PGTABLE_H */

arch/alpha/include/asm/processor.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,19 @@
88
#ifndef __ASM_ALPHA_PROCESSOR_H
99
#define __ASM_ALPHA_PROCESSOR_H
1010

11-
#include <linux/personality.h> /* for ADDR_LIMIT_32BIT */
12-
1311
/*
1412
* We have a 42-bit user address space: 4TB user VM...
1513
*/
1614
#define TASK_SIZE (0x40000000000UL)
1715

18-
#define STACK_TOP \
19-
(current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL)
16+
#define STACK_TOP (0x00120000000UL)
2017

2118
#define STACK_TOP_MAX 0x00120000000UL
2219

2320
/* This decides where the kernel will search for a free chunk of vm
2421
* space during mmap's.
2522
*/
26-
#define TASK_UNMAPPED_BASE \
27-
((current->personality & ADDR_LIMIT_32BIT) ? 0x40000000 : TASK_SIZE / 2)
23+
#define TASK_UNMAPPED_BASE (TASK_SIZE / 2)
2824

2925
/* This is dead. Everything has been moved to thread_info. */
3026
struct thread_struct { };

0 commit comments

Comments
 (0)