From c4da332192bae16c1e8b469f64432c90c6124f38 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 28 Nov 2019 14:31:38 +0100 Subject: .gitconfig: make 'git up' rebase on origin/master --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitconfig') diff --git a/.gitconfig b/.gitconfig index 9ab43a9..c48dc7a 100644 --- a/.gitconfig +++ b/.gitconfig @@ -18,7 +18,7 @@ fixes = show --pretty=fixes -s lp = log -p dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | bzip2 -9v > ../$(git describe HEAD).tar.bz2" - up = pull --rebase --autostash + up = pull --rebase --autostash origin master cr = codereview change = codereview change gofmt = codereview gofmt -- cgit v1.2.3-54-g00ecf index : net-next.git
net-next plumbingsTobias Klauser
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2012-05-19 14:04:39 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-20 04:06:16 -0400
commitb37f4d7b011955c84cdbb8c370927d93701fb174 (patch)
tree47f2b6d1175211041a85021ea4a588067e3f9f75
parent88c16dc3bb61a1c1e9d4c78f45cc2107bc8d5249 (diff)
net/ipv4/ipconfig: neaten __setup placement
The __setup macro should follow the corresponding setup handler. Signed-off-by: Eldad Zack <eldad@fogrefinery.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
cgit.cgi/linux/net-next.git/tree/arch/arm/mach-mxs/Kconfig?id=3bed491c8d28329e34f8a31e3fe64d03f3a350f1'>arch/arm/mach-mxs/Kconfig
parent0f06cde7347bff81a92395693ef977dc92756028 (diff)
ARM: mxs: Remove MMAP_MIN_ADDR setting from mxs_defconfig
The CONFIG_DEFAULT_MMAP_MIN_ADDR was set to 65536 in mxs_defconfig, this caused severe breakage of userland applications since the upper limit for ARM is 32768. By default CONFIG_DEFAULT_MMAP_MIN_ADDR is set to 4096 and can also be changed via /proc/sys/vm/mmap_min_addr if needed. Quoting Russell King [1]: "4096 is also fine for ARM too. There's not much point in having defconfigs change it - that would just be pure noise in the config files." the CONFIG_DEFAULT_MMAP_MIN_ADDR can be removed from the defconfig altogether. This problem was introduced by commit cde7c41 (ARM: configs: add defconfig for mach-mxs). [1] http://marc.info/?l=linux-arm-kernel&m=134401593807820&w=2 Signed-off-by: Marek Vasut <marex@denx.de> Cc: stable@vger.kernel.org Cc: Russell King <linux@arm.linux.org.uk> Cc: Wolfgang Denk <wd@denx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/Kconfig')