| Message ID | 20210608074437.12905-1-thunder.leizhen@huawei.com |
|---|---|
| State | Accepted |
| Commit | 03466883a0fdb5c38f2907b027565b9f253688a8 |
| Headers | show |
| Series | [1/1] PM: remove trailing spaces and tabs | expand |
On Tue, Jun 8, 2021 at 9:44 AM Zhen Lei <thunder.leizhen@huawei.com> wrote: > > Run the following command to find and remove the trailing spaces and tabs: > > find kernel/power/ -type f | xargs sed -r -i 's/[ \t]+$//' > > Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> > --- > kernel/power/Kconfig | 12 ++++++------ > kernel/power/process.c | 2 +- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig > index 6bfe3ead10ad..a12779650f15 100644 > --- a/kernel/power/Kconfig > +++ b/kernel/power/Kconfig > @@ -98,20 +98,20 @@ config PM_STD_PARTITION > default "" > help > The default resume partition is the partition that the suspend- > - to-disk implementation will look for a suspended disk image. > + to-disk implementation will look for a suspended disk image. > > - The partition specified here will be different for almost every user. > + The partition specified here will be different for almost every user. > It should be a valid swap partition (at least for now) that is turned > - on before suspending. > + on before suspending. > > The partition specified can be overridden by specifying: > > - resume=/dev/<other device> > + resume=/dev/<other device> > > - which will set the resume partition to the device specified. > + which will set the resume partition to the device specified. > > Note there is currently not a way to specify which device to save the > - suspended image to. It will simply pick the first available swap > + suspended image to. It will simply pick the first available swap > device. > > config PM_SLEEP > diff --git a/kernel/power/process.c b/kernel/power/process.c > index 50cc63534486..37401c99b7d7 100644 > --- a/kernel/power/process.c > +++ b/kernel/power/process.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > /* > - * drivers/power/process.c - Functions for starting/stopping processes on > + * drivers/power/process.c - Functions for starting/stopping processes on > * suspend transitions. > * > * Originally from swsusp. > -- Applied as 5.14 material, thanks!
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 6bfe3ead10ad..a12779650f15 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -98,20 +98,20 @@ config PM_STD_PARTITION default "" help The default resume partition is the partition that the suspend- - to-disk implementation will look for a suspended disk image. + to-disk implementation will look for a suspended disk image. - The partition specified here will be different for almost every user. + The partition specified here will be different for almost every user. It should be a valid swap partition (at least for now) that is turned - on before suspending. + on before suspending. The partition specified can be overridden by specifying: - resume=/dev/<other device> + resume=/dev/<other device> - which will set the resume partition to the device specified. + which will set the resume partition to the device specified. Note there is currently not a way to specify which device to save the - suspended image to. It will simply pick the first available swap + suspended image to. It will simply pick the first available swap device. config PM_SLEEP diff --git a/kernel/power/process.c b/kernel/power/process.c index 50cc63534486..37401c99b7d7 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * drivers/power/process.c - Functions for starting/stopping processes on + * drivers/power/process.c - Functions for starting/stopping processes on * suspend transitions. * * Originally from swsusp.
Run the following command to find and remove the trailing spaces and tabs: find kernel/power/ -type f | xargs sed -r -i 's/[ \t]+$//' Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> --- kernel/power/Kconfig | 12 ++++++------ kernel/power/process.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.25.1