* linux-next: Tree for Oct 8
@ 2013-10-08 13:44 Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Thierry Reding @ 2013-10-08 13:44 UTC (permalink / raw)
To: linux-next, linux-kernel; +Cc: Mark Brown
Hi all,
I've uploaded today's linux-next tree to the master branch of the
repository below:
git://gitorious.org/thierryreding/linux-next.git
A next-20131008 tag is also provided for convenience.
No new conflicts today. x86, ARM, PowerPC and MIPS default configurations
build fine. There were some build failures unrelated to the merge, most
of which I fixed and added as patches on top of the final merge.
Thierry
^ permalink raw reply [flat|nested] 11+ messages in thread* linux-next: manual merge of the imx-mxs tree 2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding @ 2013-10-08 13:44 ` Thierry Reding 2013-10-09 1:25 ` Shawn Guo 2013-10-08 13:44 ` manual merge of the mvebu tree Thierry Reding ` (2 subsequent siblings) 3 siblings, 1 reply; 11+ messages in thread From: Thierry Reding @ 2013-10-08 13:44 UTC (permalink / raw) To: Shawn Guo, Sebastian Hesselbarth, Olof Johansson; +Cc: linux-next, linux-kernel Today's linux-next merge of the imx-mxs tree got conflicts in arch/arm/mach-imx/mach-imx6q.c caused by commits 4d9d18a (ARM: imx: remove custom .init_time hook), e709f38 (ARM: imx6: report soc info via soc device) and 3087d32 (ARM: imx6q: use common soc revision helpers). I fixed it up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc arch/arm/mach-imx/mach-imx6q.c index 3be0fa0,398858b..049e36e --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@@ -190,8 -164,11 +162,14 @@@ static void __init imx6q_1588_init(void static void __init imx6q_init_machine(void) { + struct device *parent; + + imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", - imx6q_revision()); ++ imx_get_soc_revision()); ++ + parent = imx_soc_device_init(); + if (parent == NULL) + pr_warn("failed to initialize soc device\n"); imx6q_enet_phy_init(); ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: manual merge of the imx-mxs tree 2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding @ 2013-10-09 1:25 ` Shawn Guo 0 siblings, 0 replies; 11+ messages in thread From: Shawn Guo @ 2013-10-09 1:25 UTC (permalink / raw) To: Thierry Reding Cc: Sebastian Hesselbarth, Olof Johansson, linux-next, linux-kernel On Tue, Oct 08, 2013 at 03:44:12PM +0200, Thierry Reding wrote: > Today's linux-next merge of the imx-mxs tree got conflicts in > > arch/arm/mach-imx/mach-imx6q.c > > caused by commits 4d9d18a (ARM: imx: remove custom .init_time hook), > e709f38 (ARM: imx6: report soc info via soc device) and 3087d32 (ARM: > imx6q: use common soc revision helpers). > > I fixed it up (see below). Please verify that the resolution looks > correct. Thanks, Thierry. The resolution is correct. Shawn ^ permalink raw reply [flat|nested] 11+ messages in thread
* manual merge of the mvebu tree 2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding 2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding @ 2013-10-08 13:44 ` Thierry Reding 2013-10-08 14:08 ` Jason Cooper 2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding 2013-10-08 13:44 ` linux-next: manual merge of the tty-next tree Thierry Reding 3 siblings, 1 reply; 11+ messages in thread From: Thierry Reding @ 2013-10-08 13:44 UTC (permalink / raw) To: Jason Cooper, Sebastian Hesselbarth; +Cc: linux-next, linux-kernel Today's linux-next merge of the mvebu tree got conflicts in: arch/arm/mach-dove/board-dt.c caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init), e3730b4 (ARM: dove: switch to DT probed mbus address windows), and 51e40f5 (ARM: dove: remove custom .init_time hook). I fixed them up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc arch/arm/mach-dove/board-dt.c index ddb8663,9a116d7..49fa9ab --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-dove/board-dt.c @@@ -17,37 -20,15 +17,8 @@@ #include <mach/dove.h> #include <mach/pm.h> #include <plat/common.h> -#include <plat/irq.h> #include "common.h" - /* - * There are still devices that doesn't even know about DT, - * get clock gates here and add a clock lookup. - */ - static void __init dove_legacy_clk_init(void) - { - struct device_node *np = of_find_compatible_node(NULL, NULL, - "marvell,dove-gating-clock"); - struct of_phandle_args clkspec; - - clkspec.np = np; - clkspec.args_count = 1; - - clkspec.args[0] = CLOCK_GATING_BIT_PCIE0; - orion_clkdev_add("0", "pcie", - of_clk_get_from_provider(&clkspec)); - - clkspec.args[0] = CLOCK_GATING_BIT_PCIE1; - orion_clkdev_add("1", "pcie", - of_clk_get_from_provider(&clkspec)); - } - - static void __init dove_dt_init_early(void) -static void __init dove_dt_time_init(void) --{ - mvebu_mbus_init("marvell,dove-mbus", - BRIDGE_WINS_BASE, BRIDGE_WINS_SZ, - DOVE_MC_WINS_BASE, DOVE_MC_WINS_SZ); - of_clk_init(NULL); - clocksource_of_init(); --} -- static void __init dove_dt_init(void) { pr_info("Dove 88AP510 SoC\n"); @@@ -73,7 -47,7 +37,6 @@@ static const char * const dove_dt_board DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)") .map_io = dove_map_io, - .init_early = dove_dt_init_early, - .init_time = dove_dt_time_init, .init_machine = dove_dt_init, .restart = dove_restart, .dt_compat = dove_dt_board_compat, ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: manual merge of the mvebu tree 2013-10-08 13:44 ` manual merge of the mvebu tree Thierry Reding @ 2013-10-08 14:08 ` Jason Cooper 0 siblings, 0 replies; 11+ messages in thread From: Jason Cooper @ 2013-10-08 14:08 UTC (permalink / raw) To: Thierry Reding; +Cc: Sebastian Hesselbarth, linux-next, linux-kernel On Tue, Oct 08, 2013 at 03:44:13PM +0200, Thierry Reding wrote: > Today's linux-next merge of the mvebu tree got conflicts in: > > arch/arm/mach-dove/board-dt.c > > caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init), > e3730b4 (ARM: dove: switch to DT probed mbus address windows), and 51e40f5 > (ARM: dove: remove custom .init_time hook). > > I fixed them up (see below). Please verify that the resolution looks > correct. Looks good to me, thanks! thx, Jason. ^ permalink raw reply [flat|nested] 11+ messages in thread
* linux-next: manual merge of the net-next tree 2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding 2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding 2013-10-08 13:44 ` manual merge of the mvebu tree Thierry Reding @ 2013-10-08 13:44 ` Thierry Reding 2013-10-08 13:44 ` linux-next: manual merge of the tty-next tree Thierry Reding 3 siblings, 0 replies; 11+ messages in thread From: Thierry Reding @ 2013-10-08 13:44 UTC (permalink / raw) To: David S. Miller, Michael S. Tsirkin, Joe Perches; +Cc: linux-next, linux-kernel Today's linux-next merge of the net-next tree got a conflict in: include/linux/netdevice.h caused by commits 3573540 (netif_set_xps_queue: make cpu mask const) and f629d20 ([networking]device.h: Remove extern from function prototypes). I fixed it up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc include/linux/netdevice.h index 25f5d2d,6d77e0f..2e53b44 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@@ -2264,12 -2273,11 +2273,11 @@@ static inline void netif_wake_subqueue( } #ifdef CONFIG_XPS - extern int netif_set_xps_queue(struct net_device *dev, - const struct cpumask *mask, - u16 index); -int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, ++int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask, + u16 index); #else static inline int netif_set_xps_queue(struct net_device *dev, - struct cpumask *mask, + const struct cpumask *mask, u16 index) { return 0; ^ permalink raw reply [flat|nested] 11+ messages in thread
* linux-next: manual merge of the tty-next tree 2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding ` (2 preceding siblings ...) 2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding @ 2013-10-08 13:44 ` Thierry Reding 2013-10-09 6:19 ` Greg Kroah-Hartman 3 siblings, 1 reply; 11+ messages in thread From: Thierry Reding @ 2013-10-08 13:44 UTC (permalink / raw) To: Greg Kroah-Hartman, Fabio Estevam, Sascha Hauer, Guenter Roeck Cc: linux-next, linux-kernel Today's linux-next merge of the tty-next tree got a conflict in drivers/tty/serial/imx.c caused by commits e2c2725 (serial: imx: Use NULL as the last argument of add_preferred_console()) and b4e788d (Revert "serial: i.MX: evaluate linux,stdout-path property"). The former commit only changes a parameter from 0 to NULL I assume it doesn't solve the build breakage mentioned as reason for the revert, so I kept the reversion. Thierry ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: manual merge of the tty-next tree 2013-10-08 13:44 ` linux-next: manual merge of the tty-next tree Thierry Reding @ 2013-10-09 6:19 ` Greg Kroah-Hartman 0 siblings, 0 replies; 11+ messages in thread From: Greg Kroah-Hartman @ 2013-10-09 6:19 UTC (permalink / raw) To: Thierry Reding Cc: Fabio Estevam, Sascha Hauer, Guenter Roeck, linux-next, linux-kernel On Tue, Oct 08, 2013 at 03:44:15PM +0200, Thierry Reding wrote: > Today's linux-next merge of the tty-next tree got a conflict in > > drivers/tty/serial/imx.c > > caused by commits e2c2725 (serial: imx: Use NULL as the last argument of > add_preferred_console()) and b4e788d (Revert "serial: i.MX: evaluate > linux,stdout-path property"). > > The former commit only changes a parameter from 0 to NULL I assume it > doesn't solve the build breakage mentioned as reason for the revert, so > I kept the reversion. That sounds correct, thanks. greg k-h ^ permalink raw reply [flat|nested] 11+ messages in thread
* linux-next: Tree for Oct 9
@ 2013-10-09 14:14 Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
0 siblings, 1 reply; 11+ messages in thread
From: Thierry Reding @ 2013-10-09 14:14 UTC (permalink / raw)
To: linux-next, linux-kernel; +Cc: Mark Brown
Hi all,
I've uploaded today's linux-next tree to the master branch of the
repository below:
git://gitorious.org/thierryreding/linux-next.git
A next-20131009 tag is also provided for convenience.
Gained a few conflicts, but nothing too exciting. x86, ARM, PowerPC and
MIPS default configurations build fine. There were some build failures
unrelated to the merge, most of which I fixed and added as patches on
top of the final merge.
Thierry
^ permalink raw reply [flat|nested] 11+ messages in thread* linux-next: manual merge of the imx-mxs tree 2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding @ 2013-10-09 14:14 ` Thierry Reding 2013-10-09 16:56 ` Fabio Estevam 0 siblings, 1 reply; 11+ messages in thread From: Thierry Reding @ 2013-10-09 14:14 UTC (permalink / raw) To: Shawn Guo, Fabio Estevam, Sebastian Hesselbarth; +Cc: linux-next, linux-kernel Today's linux-next merge of the imx-mxs tree got conflicts in arch/arm/mach-imx/clk-imx51-imx53.c arch/arm/mach-imx/mach-imx6q.c caused by commits 0efe995 (ARM: mach-imx: clk-imx51-imx53: Retrieve base address and irq from dt), d2b36f6 (ARM: imx: replace imx6q_restart() with mxc_restart()) and 4d9d18a (ARM: imx: remove custom .init_time hook). I fixed them up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc arch/arm/mach-imx/clk-imx51-imx53.c index ceaac9c,03ca2e3..fa4de9a --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c @@@ -11,9 -11,11 +11,12 @@@ #include <linux/clk.h> #include <linux/io.h> #include <linux/clkdev.h> +#include <linux/clk-provider.h> #include <linux/of.h> #include <linux/err.h> + #include <linux/of.h> + #include <linux/of_address.h> + #include <linux/of_irq.h> #include "crm-regs-imx5.h" #include "clk.h" @@@ -464,16 -468,13 +467,17 @@@ int __init mx51_clocks_init(unsigned lo return 0; } -int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, - unsigned long rate_ckih1, unsigned long rate_ckih2) +static void __init mx51_clocks_init_dt(struct device_node *np) +{ + mx51_clocks_init(0, 0, 0, 0); +} +CLK_OF_DECLARE(imx51_ccm, "fsl,imx51-ccm", mx51_clocks_init_dt); + +static void __init mx53_clocks_init(struct device_node *np) { - int i; + int i, irq; unsigned long r; - struct device_node *np; + void __iomem *base; clk[pll1_sw] = imx_clk_pllv2("pll1_sw", "osc", MX53_DPLL1_BASE); clk[pll2_sw] = imx_clk_pllv2("pll2_sw", "osc", MX53_DPLL2_BASE); @@@ -568,5 -567,22 +569,13 @@@ r = clk_round_rate(clk[usboh3_per_gate], 54000000); clk_set_rate(clk[usboh3_per_gate], r); + + np = of_find_compatible_node(NULL, NULL, "fsl,imx53-gpt"); + base = of_iomap(np, 0); + WARN_ON(!base); + irq = irq_of_parse_and_map(np, 0); + mxc_timer_init(base, irq); + + return 0; } - -int __init mx51_clocks_init_dt(void) -{ - return mx51_clocks_init(0, 0, 0, 0); -} - -int __init mx53_clocks_init_dt(void) -{ - return mx53_clocks_init(0, 0, 0, 0); -} +CLK_OF_DECLARE(imx53_ccm, "fsl,imx53-ccm", mx53_clocks_init); diff --cc arch/arm/mach-imx/mach-imx6q.c index 3be0fa0,53e70f4..0f9f241 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@@ -11,9 -11,10 +11,8 @@@ */ #include <linux/clk.h> -#include <linux/clk-provider.h> #include <linux/clkdev.h> -#include <linux/clocksource.h> #include <linux/cpu.h> - #include <linux/delay.h> #include <linux/export.h> #include <linux/init.h> #include <linux/io.h> @@@ -190,8 -133,13 +131,16 @@@ static void __init imx6q_1588_init(void static void __init imx6q_init_machine(void) { + struct device *parent; + + imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", - imx6q_revision()); ++ imx_get_soc_revision()); ++ + mxc_arch_reset_init_dt(); + + parent = imx_soc_device_init(); + if (parent == NULL) + pr_warn("failed to initialize soc device\n"); imx6q_enet_phy_init(); ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: manual merge of the imx-mxs tree 2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding @ 2013-10-09 16:56 ` Fabio Estevam 0 siblings, 0 replies; 11+ messages in thread From: Fabio Estevam @ 2013-10-09 16:56 UTC (permalink / raw) To: Thierry Reding Cc: Shawn Guo, Fabio Estevam, Sebastian Hesselbarth, linux-next, linux-kernel Hi Thierry, On Wed, Oct 9, 2013 at 11:14 AM, Thierry Reding <thierry.reding@gmail.com> wrote: > Today's linux-next merge of the imx-mxs tree got conflicts in > > arch/arm/mach-imx/clk-imx51-imx53.c > arch/arm/mach-imx/mach-imx6q.c > > caused by commits 0efe995 (ARM: mach-imx: clk-imx51-imx53: Retrieve base > address and irq from dt), d2b36f6 (ARM: imx: replace imx6q_restart() > with mxc_restart()) and 4d9d18a (ARM: imx: remove custom .init_time > hook). > > I fixed them up (see below). Please verify that the resolution looks > good. ... > +static void __init mx53_clocks_init(struct device_node *np) > { > - int i; > + int i, irq; > unsigned long r; > - struct device_node *np; > + void __iomem *base; > > clk[pll1_sw] = imx_clk_pllv2("pll1_sw", "osc", MX53_DPLL1_BASE); > clk[pll2_sw] = imx_clk_pllv2("pll2_sw", "osc", MX53_DPLL2_BASE); > @@@ -568,5 -567,22 +569,13 @@@ > > r = clk_round_rate(clk[usboh3_per_gate], 54000000); > clk_set_rate(clk[usboh3_per_gate], r); > + > + np = of_find_compatible_node(NULL, NULL, "fsl,imx53-gpt"); > + base = of_iomap(np, 0); > + WARN_ON(!base); > + irq = irq_of_parse_and_map(np, 0); > + mxc_timer_init(base, irq); > + > + return 0; This 'return 0' should be removed as the function now changed to void. I have sent a patch fixing it. Regards, Fabio Estevam ^ permalink raw reply [flat|nested] 11+ messages in thread
* linux-next: Tree for Oct 24
@ 2013-10-24 16:31 Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
0 siblings, 1 reply; 11+ messages in thread
From: Thierry Reding @ 2013-10-24 16:31 UTC (permalink / raw)
To: linux-next, linux-kernel; +Cc: Mark Brown
Hi all,
I've uploaded today's linux-next tree to the master branch of the
repository below:
git://gitorious.org/thierryreding/linux-next.git
A next-20131024 tag is also provided for convenience.
Quite a few new conflicts. Some of them non-trivial. I've fixed another
set of build failures, so 32-bit and 64-bit allmodconfigs build fine on
x86. ARM and x86 default configurations also build fine. PowerPC is in
pretty bad shape, mostly due to some OF header rework going on.
I'm somewhat short on time today, so I probably won't manage to send out
detailed conflict reports out today. I'll try to do that tomorrow,
though.
Thierry
^ permalink raw reply [flat|nested] 11+ messages in thread* linux-next: manual merge of the c6x tree 2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding @ 2013-10-25 13:03 ` Thierry Reding 2013-10-25 13:03 ` linux-next: manual merge of the imx-mxs tree Thierry Reding 0 siblings, 1 reply; 11+ messages in thread From: Thierry Reding @ 2013-10-25 13:03 UTC (permalink / raw) To: Will Deacon, Russell King, Mark Salter; +Cc: linux-next, linux-kernel Today's linux-next merge of the c6x tree got a conflict in arch/arm/Kconfig caused by commits 148104c (ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64) and commit d701884 (arm: select ARCH_MIGHT_HAVE_PC_PARPORT). I fixed it up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc arch/arm/Kconfig index c06647d,7db8abe0..b6a708e --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -5,7 -5,7 +5,8 @@@ config AR select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAVE_CUSTOM_GPIO_H + select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_EXTABLE_SORT if MMU select CLONE_BACKWARDS ^ permalink raw reply [flat|nested] 11+ messages in thread
* linux-next: manual merge of the imx-mxs tree 2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding @ 2013-10-25 13:03 ` Thierry Reding 0 siblings, 0 replies; 11+ messages in thread From: Thierry Reding @ 2013-10-25 13:03 UTC (permalink / raw) To: Nishanth Menon, Rafael J. Wysocki, Tim Harvey, Shawn Guo Cc: linux-next, linux-kernel Today's linux-next merge of the imx-mxs tree got a conflict in arch/arm/mach-imx/mach-imx6q.c caused by commits 6aec339 (PM / OPP: rename header to linux/pm_opp.h) and 0794410 (imx: add PCI fixup for PEX860X on Gateworks board). I fixed it up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc arch/arm/mach-imx/mach-imx6q.c index eae5642,1ac719d..bc98799 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@@ -23,8 -23,9 +23,10 @@@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> - #include <linux/pm_opp.h> + #include <linux/opp.h> + #include <linux/pci.h> #include <linux/phy.h> ++#include <linux/pm_opp.h> #include <linux/reboot.h> #include <linux/regmap.h> #include <linux/micrel_phy.h> ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-10-25 13:03 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding 2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding 2013-10-09 1:25 ` Shawn Guo 2013-10-08 13:44 ` manual merge of the mvebu tree Thierry Reding 2013-10-08 14:08 ` Jason Cooper 2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding 2013-10-08 13:44 ` linux-next: manual merge of the tty-next tree Thierry Reding 2013-10-09 6:19 ` Greg Kroah-Hartman 2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding 2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding 2013-10-09 16:56 ` Fabio Estevam 2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding 2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding 2013-10-25 13:03 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).