From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 70dd356329f2f5617a0f4572d15c2d6ae94e1c6f
Date: Thu, 20 Jun 2019 08:36:18 +0100 [thread overview]
Message-ID: <20190620073618.D4F0B84FDAF@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2808 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 70dd356329f2f5617a0f4572d15c2d6ae94e1c6f (commit)
via 3a8fef331dd2950705c1d32ec314fa72a84463d9 (commit)
via 0dd16f4047789c69a3234eec0fdb963509f3fedd (commit)
from 70590cef482e17063838e62ad1aad349ef1133b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 70dd356329f2f5617a0f4572d15c2d6ae94e1c6f
Merge: 3a8fef331 0dd16f404
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jun 20 09:35:59 2019 +0200
Merge remote-tracking branch 'origin/master' into next
commit 3a8fef331dd2950705c1d32ec314fa72a84463d9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jun 20 09:33:17 2019 +0200
kernel: remove RPi DMA allignment revert
TODO: test if RPi works without now or if we need to
revert more of the allignment patches.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/vpnmain.cgi | 2 +-
lfs/linux | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index fbc274919..750b69b1d 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3338,7 +3338,7 @@ sub make_algos($$$$$) {
push(@algo, $int);
}
- if ($pfs || $grp eq "none") {
+ if (!$pfs || $grp eq "none") {
# noop
} elsif ($grp =~ m/^e(.*)$/) {
push(@algo, "ecp$1");
diff --git a/lfs/linux b/lfs/linux
index 7195a7f75..6669cf220 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -153,13 +153,10 @@ endif
ifeq "$(KCFG)" "-multi"
# Apply Arm-multiarch kernel patches.
cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
-
endif
ifeq "$(BUILD_ARCH)" "aarch64"
# Apply Arm-multiarch kernel patches.
cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14-Revert-usb-dwc2-Fix-DMA-alignment.patch
endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-06-20 7:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190620073618.D4F0B84FDAF@people01.i.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox