refresh Debian patches
This commit is contained in:
@@ -9,11 +9,9 @@ This reverts commit 8396c793ffdf28bb8aee7cfe0891080f8cab7890.
|
||||
drivers/mmc/host/dw_mmc.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
|
||||
index 41e451235f637..e9f6e4e622901 100644
|
||||
--- a/drivers/mmc/host/dw_mmc.c
|
||||
+++ b/drivers/mmc/host/dw_mmc.c
|
||||
@@ -2957,8 +2957,8 @@ static int dw_mci_init_slot(struct dw_mci *host)
|
||||
@@ -2957,8 +2957,8 @@ static int dw_mci_init_slot(struct dw_mc
|
||||
if (host->use_dma == TRANS_MODE_IDMAC) {
|
||||
mmc->max_segs = host->ring_size;
|
||||
mmc->max_blk_size = 65535;
|
||||
@@ -24,6 +22,3 @@ index 41e451235f637..e9f6e4e622901 100644
|
||||
mmc->max_blk_count = mmc->max_req_size / 512;
|
||||
} else if (host->use_dma == TRANS_MODE_EDMAC) {
|
||||
mmc->max_segs = 64;
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
@@ -24,7 +24,7 @@ negative cases.]
|
||||
---
|
||||
--- a/tools/power/cpupower/bench/system.c
|
||||
+++ b/tools/power/cpupower/bench/system.c
|
||||
@@ -58,12 +58,19 @@ long long int get_time()
|
||||
@@ -45,12 +45,19 @@ long long int get_time()
|
||||
|
||||
int set_cpufreq_governor(char *governor, unsigned int cpu)
|
||||
{
|
||||
|
@@ -18,7 +18,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
|
||||
--- a/fs/btrfs/super.c
|
||||
+++ b/fs/btrfs/super.c
|
||||
@@ -2619,7 +2619,7 @@ module_exit(exit_btrfs_fs)
|
||||
@@ -2638,7 +2638,7 @@ module_exit(exit_btrfs_fs)
|
||||
|
||||
MODULE_DESCRIPTION("B-Tree File System (BTRFS)");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -29,7 +29,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
MODULE_SOFTDEP("pre: blake2b-256");
|
||||
--- a/fs/ext4/super.c
|
||||
+++ b/fs/ext4/super.c
|
||||
@@ -7404,6 +7404,6 @@ static void __exit ext4_exit_fs(void)
|
||||
@@ -7435,6 +7435,6 @@ static void __exit ext4_exit_fs(void)
|
||||
MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
|
||||
MODULE_DESCRIPTION("Fourth Extended Filesystem");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -49,7 +49,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
|
||||
--- a/fs/nfsd/nfsctl.c
|
||||
+++ b/fs/nfsd/nfsctl.c
|
||||
@@ -2353,5 +2353,8 @@ static void __exit exit_nfsd(void)
|
||||
@@ -2352,5 +2352,8 @@ static void __exit exit_nfsd(void)
|
||||
MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");
|
||||
MODULE_DESCRIPTION("In-kernel NFS server");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
@@ -7,7 +7,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
|
||||
---
|
||||
--- a/tools/lib/api/Makefile
|
||||
+++ b/tools/lib/api/Makefile
|
||||
@@ -29,7 +29,7 @@ endif
|
||||
@@ -39,7 +39,7 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(DEBUG),0)
|
||||
|
@@ -27,11 +27,9 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
net/netfilter/xt_mark.c | 2 +-
|
||||
3 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
|
||||
index d80abd6ccaf8..6dcf4bc7e30b 100644
|
||||
--- a/net/netfilter/xt_NFLOG.c
|
||||
+++ b/net/netfilter/xt_NFLOG.c
|
||||
@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = {
|
||||
@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] _
|
||||
{
|
||||
.name = "NFLOG",
|
||||
.revision = 0,
|
||||
@@ -40,11 +38,9 @@ index d80abd6ccaf8..6dcf4bc7e30b 100644
|
||||
.checkentry = nflog_tg_check,
|
||||
.destroy = nflog_tg_destroy,
|
||||
.target = nflog_tg,
|
||||
diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c
|
||||
index f3fa4f11348c..a642ff09fc8e 100644
|
||||
--- a/net/netfilter/xt_TRACE.c
|
||||
+++ b/net/netfilter/xt_TRACE.c
|
||||
@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = {
|
||||
@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] _
|
||||
.target = trace_tg,
|
||||
.checkentry = trace_tg_check,
|
||||
.destroy = trace_tg_destroy,
|
||||
@@ -52,11 +48,9 @@ index f3fa4f11348c..a642ff09fc8e 100644
|
||||
},
|
||||
#endif
|
||||
};
|
||||
diff --git a/net/netfilter/xt_mark.c b/net/netfilter/xt_mark.c
|
||||
index f76fe04fc9a4..65b965ca40ea 100644
|
||||
--- a/net/netfilter/xt_mark.c
|
||||
+++ b/net/netfilter/xt_mark.c
|
||||
@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
|
||||
@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __
|
||||
{
|
||||
.name = "MARK",
|
||||
.revision = 2,
|
||||
@@ -65,6 +59,3 @@ index f76fe04fc9a4..65b965ca40ea 100644
|
||||
.target = mark_tg,
|
||||
.targetsize = sizeof(struct xt_mark_tginfo2),
|
||||
.me = THIS_MODULE,
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
@@ -11,7 +11,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
--- a/tools/build/feature/test-bpf.c
|
||||
+++ b/tools/build/feature/test-bpf.c
|
||||
@@ -35,8 +35,10 @@ int main(void)
|
||||
@@ -41,8 +41,10 @@ int main(void)
|
||||
attr.prog_flags = 0;
|
||||
|
||||
/*
|
||||
|
@@ -6,7 +6,7 @@ Signed-off-by: Ben Hutchings <benh@debian.org>
|
||||
---
|
||||
--- a/tools/perf/Makefile.perf
|
||||
+++ b/tools/perf/Makefile.perf
|
||||
@@ -785,7 +785,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
|
||||
@@ -925,7 +925,7 @@ $(OUTPUT)dlfilters/%.o: dlfilters/%.c in
|
||||
.SECONDARY: $(DLFILTERS:.so=.o)
|
||||
|
||||
$(OUTPUT)dlfilters/%.so: $(OUTPUT)dlfilters/%.o
|
||||
|
@@ -14,8 +14,6 @@ Acked-by: Ian Rogers <irogers@google.com>
|
||||
tools/lib/symbol/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/lib/symbol/Makefile b/tools/lib/symbol/Makefile
|
||||
index 13d43c6f92b4..4a08cc4e19f2 100644
|
||||
--- a/tools/lib/symbol/Makefile
|
||||
+++ b/tools/lib/symbol/Makefile
|
||||
@@ -39,7 +39,7 @@ endif
|
||||
@@ -27,5 +25,3 @@ index 13d43c6f92b4..4a08cc4e19f2 100644
|
||||
endif
|
||||
|
||||
# Treat warnings as errors unless directed not to
|
||||
--
|
||||
2.39.2
|
||||
|
@@ -17,7 +17,7 @@ Add references to TCP wrappers configuration in the manual page.
|
||||
|
||||
.SH OPTIONS
|
||||
.HP
|
||||
@@ -69,7 +70,8 @@ Show version.
|
||||
@@ -75,7 +76,8 @@ Show version.
|
||||
|
||||
.B usbipd
|
||||
offers no authentication or authorization for USB/IP. Any
|
||||
|
Reference in New Issue
Block a user