[PATCH] Remove powerpc specific parts of 3c509 driver

On powerpc and ppc, insl_ns and insl are identical as are outsl_ns and outsl, so remove the conditional use of insl_ns and outsl_ns. Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- drivers/net/3c509.c |9 - 1 files changed, 0 insertions(+), 9 deletions

[PATCH 1/2] get_property returns const

This is left over from a previous cleanup of get_property. Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- drivers/net/ehea/ehea_main.c | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) Jeff, This patch is on top of your upstream branch from today. This change

[PATCH 2/2] Rename get_property to of_get_property: drivers/net

This is part of the consolidation of the OpenFirmware code ebtween PowerPC and Sparc. Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- drivers/net/bmac.c |5 +++-- drivers/net/ehea/ehea_main.c |6 +++--- drivers/net/mace.c |4 ++-- drivers/net/pasemi_mac.c

Re: [PATCH 2/2] Rename get_property to of_get_property: drivers/net

.) -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpZkJvTxszQr.pgp Description: PGP signature

[PATCH 1/2] get_property returns const

This is the last place that needs changing since get_property was changed to return const void *. Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- drivers/net/ehea/ehea_main.c | 13 ++--- 1 files changed, 6 insertions(+), 7 deletions(-) -- Cheers, Stephen Rothwell

[PATCH 2/2] Rename get_property to of_get_property: drivers

These are all the remaining instances of get_property. Simple rename of get_property to of_get_property. Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- drivers/ata/sata_svw.c |2 +- drivers/char/agp/uninorth-agp.c|2 +- drivers/char/briq_panel.c

ehea.c compile error

-- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpGOQQW15TI0.pgp Description: PGP signature

Re: [PATCH] ehea: Receive SKB Aggregation

in this patch. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpccSVHP2g0w.pgp Description: PGP signature

Re: [PATCH] [02/10] pasemi_mac: Stop using the pci config space accessors for register read/writes

don't provide the register space in the device tree. Luckily ^^^ that -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgp00KliTG9BH.pgp Description: PGP signature

Re: [PATCH v2] [02/10] pasemi_mac: Stop using the pci config space accessors for register read/writes

) + pci_dev_put(mac-dma_pdev); It is not documented as such (as far as I can see), but pci_dev_put is safe to call with NULL. And there are other places in the kernel that explicitly use that fact. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr

Re: [PATCH v2] [02/10] pasemi_mac: Stop using the pci config space accessors for register read/writes

On Fri, 24 Aug 2007 13:11:04 -0500 Olof Johansson [EMAIL PROTECTED] wrote: On Fri, Aug 24, 2007 at 02:05:31PM +1000, Stephen Rothwell wrote: It is not documented as such (as far as I can see), but pci_dev_put is safe to call with NULL. And there are other places in the kernel

Re: [PATCH 6/9] fs_enet: Be an of_platform device when CONFIG_PPC_CPM_NEW_BINDING is set.

@@ -36,6 +36,10 @@ #include asm/irq.h #include asm/uaccess.h +#ifdef CONFIG_PPC_CPM_NEW_BINDING +#include asm/of_platform.h And here Sorry if I missed these last time around. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr

Re: [PATCH 4/5] ibmebus: Move to of_device and of_platform_driver, match eHCA and eHEA drivers

instead. This, of course, means that you don't need drv-driver.name = drv-name; in ibmebus_register_driver. Sorry for not picking this up earlier. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpn5JuWY9o2M.pgp Description: PGP

[PATCH] rpc_rdma: we need to cast u64 to unsigned long long for printing

pseries_defconfig build. Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- net/sunrpc/xprtrdma/rpc_rdma.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) -- Cheers, Stephen Rothwell[EMAIL PROTECTED] diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc

[PATCH] af_key: suppress a warning for 64k pages.

On PowerPC allmodconfig build we get this: net/key/af_key.c:400: warning: comparison is always false due to limited range of data type Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- net/key/af_key.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- Cheers, Stephen

Re: [PATCH] af_key: suppress a warning for 64k pages.

OK if it is always false. Perhaps a simple (u32) cast on the left branch of the comparison is sufficient? Unfortunately, that does not suppress the warning (gcc is getting too smart :-(). -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr

[PATCH] af_key: suppress a warning for 64k pages.

On PowerPC allmodconfig build we get this: net/key/af_key.c:400: warning: comparison is always false due to limited range of data type Signed-off-by: Stephen Rothwell [EMAIL PROTECTED] --- net/key/af_key.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) This version gets rid

Re: [PATCH 1/3] [NET] phy/fixed.c: rework to not duplicate PHY layer functionality

); retun ret; } } -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpsSGdJcSTEX.pgp Description: PGP signature

Re: [PATCH 2/3] arch/ : Platform changes for UCC TDM driver for MPC8323ERDB.Also includes related QE changes.

); + of_node_put(brg); + return brg_input_freq; + } + } return brg_clk; } -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgprvL9K6FPZV.pgp Description: PGP signature

Re: [PATCH] UCC TDM driver for QE based MPC83xx platforms.

this like: { .type = tdm, .compatible = fsl,ucc-tdm, }, {}, +static struct of_platform_driver ucc_tdm_driver = { .driver = { + .name = DRV_NAME, }, -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr

Re: [PATCH 2/3] Platform changes for UCC TDM driver for MPC8323ERDB.Also includes related QE changes and dts entries.

*tdm_rx_sync; + char *tdm_tx_sync; If you make these const char * you won't have to cast the results of of_get_property() that you assign to them. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpyvsNn94r9V.pgp Description: PGP signature

Re: [PATCH] [POWERPC] iSeries: fix section mismatch in iseries_veth

On Tue, 05 Feb 2008 13:32:33 -0500 Jeff Garzik [EMAIL PROTECTED] wrote: it's trivial enough to not matter, and faster to just... applied (if you'll pardon the bad grammar) Thanks. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr

linux-next: manual merge of the net-next tree with the net tree

) from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/phy/phy.c index 47cd578052fc,1457ecf75dcc.. --- a/drivers/net/phy/phy.c +++ b

linux-next: manual merge of the scsi tree with the net-next tree

fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/target/target_core_user.c index edc98250,21b438ec4700.. --- a/drivers/target/target_core_user.c +++ b/drivers

linux-next: build failure after merge of the staging tree

-next tree. I applied the below merge fix patch (I didn't know if it should be true or false - advise would be nice). However, there are still way to many warnings from this driver, so I have disabled it again. From: Stephen Rothwell s...@canb.auug.org.au Date: Wed, 3 Jun 2015 17:09:03 +1000

linux-next: manual merge of the net-next tree with the net tree

the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/packet/af_packet.c index fe1610ddeacf,20e8c40da90d.. --- a/net/packet/af_packet.c +++ b/net/packet

linux-next: build warnings after merge of the net-next tree

'this_cpu_ptr' return this_cpu_ptr((void __percpu *) cnt-pcnt); ^ and many more. Introduced by commit: 71ae0dff02d7 (netfilter: xtables: use percpu rule counters) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpOswghHwbve.pgp Description: OpenPGP

linux-next: build failure after merge of the net-next tree

but not used [-Wunused-function] static int xgene_get_port_id_acpi(struct device *dev, ^ Caused by commit 0738c54d6324 (drivers: net: xgene: Fix the ACPI support for RGMII/SGMII0/XFI interface of APM X-Gene SoC ethernet controller). I have applied this patch for today: From: Stephen Rothwell

Re: linux-next: build failure after merge of most of the trees

is that vmalloc() users must include vmalloc.h themselves, not by an indirect include. Yep, that is a special case of Rule 1. I sent one fix, and prepared others, but I prefer that each offender is fixed. Yeah, thanks to Dave for that. -- Cheers, Stephen Rothwells

Re: linux-next: build failure after merge of most of the trees

platform builds. So if you want this to stop happening, work on that. I may have a look in my (copious) free time :-) I've applied the following to net-next, thanks for your report. Thanks for that. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp014LV9n9Zn.pgp

[RFC][PATCH] x86: remove vmalloc.h from asm/io.h

...@perex.cz Cc: Takashi Iwai ti...@suse.de Cc: Andrew Morton a...@linux-foundation.org Suggested-by: David Miller da...@davemloft.net Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- Based in Linus' tree of today. There are probably more places that need vmalloc.h included, but this passes

Re: [RFC][PATCH] x86: remove vmalloc.h from asm/io.h

the rest. Good idea. the allnoconfigs produced this further patch. I will squash it into the original. The defconfigs built ok. From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 29 May 2015 22:01:41 +1000 Subject: [PATCH] x86: more fixes for removing vmalloc.h fron asm/io.h Signed-off

Re: [RFC][PATCH] x86: remove vmalloc.h from asm/io.h

Hi Takashi, On Fri, 29 May 2015 14:43:14 +0200 Takashi Iwai ti...@suse.de wrote: For the sound bits, Acked-by: Takashi Iwai ti...@suse.de Thanks, noted. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp0duKaM_eov.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the net-next tree

= cpumask_local_spread, lament) from Linus' tree. I have applied the following merge fix patch (Dave, you could do this by back merging commit f36963c9d3f6 from Linus' tree - which is based on v4.1-rc2 if that worries you). Please yell if this is not correct (it does build). From: Stephen Rothwell s

Re: [RFC][PATCH] x86: remove vmalloc.h from asm/io.h

Hi Dave, On Mon, 01 Jun 2015 15:59:31 -0700 (PDT) David Miller da...@davemloft.net wrote: From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 29 May 2015 19:18:47 +1000 Nothing in asm/io.h uses anything from vmalloc.h, so remove the include and fix up the build problems

linux-next: manual merge of the net-next tree with Linus' tree

tree. I fixed it up (the latter removed the file, so I did that - there may be more needed) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpfQBjvZ33om.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of most of the trees

-lport_loopid_map); ^ Ouch :-( Maybe commit 095dc8e0c368 (tcp: fix/cleanup inet_ehash_locks_alloc())? (that is the only commit I can find that remove an include of vmalloc.h Ah ha. I applied this fix patch: From: Stephen Rothwell s...@canb.auug.org.au Date: Thu, 28 May 2015 21:54:40 +1000

linux-next: manual merge of the net-next tree with the net tree

Modem) from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/usb/qmi_wwan.c index 64a60afbe50c,1f7a7cd97e50.. --- a/drivers/net/usb

linux-next: build failure after merge of the net-next tree

+0xb3b58): first defined here drivers/net/built-in.o:(.opd+0x2ae88): multiple definition of `vnic_wq_init_start' drivers/scsi/built-in.o:(.opd+0xace0): first defined here Caused by commit 373fb0873d43 (enic: add devcmd2) I have reverted that commit for today. -- Cheers, Stephen Rothwell

linux-next: build failure after merge of the net-next tree

-20150821 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: linux-next: build failure after merge of the net-next tree

Hi Dave, On Sun, 23 Aug 2015 20:33:25 -0700 (PDT) David Miller da...@davemloft.net wrote: From: Stephen Rothwell s...@canb.auug.org.au Date: Mon, 24 Aug 2015 13:21:11 +1000 After merging the net-next tree, today's linux-next build (arm multi_v7_defconfig) failed like this: Fixed

linux-next: build failure after merge of the net-next tree

] lwtstate_free(lwtstate); ^ Caused by commit df383e6240ef (lwtunnel: fix memory leak) CONFIG_LWTUNNEL is not set for this build. I reverted that commit for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line

linux-next: manual merge of the net-next tree with the net tree

in br_mdb_notify) from the net-next tree. I fixed it up (hopefully - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/bridge/br_multicast.c index 0b39dcc65b94,fd238587e032.. --- a/net

linux-next: manual merge of the net-next tree with the net tree

statistics collection) from the net-next tree. I fixed it up (using the error path from the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line unsubscribe netdev

linux-next: manual merge of the net-next tree with the net tree

CONFIG_MDIO_OCTEON for ThunderX NIC) from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/ethernet/cavium/Kconfig index 02e23e6f1424,358442087878

linux-next: manual merge of the net-next tree with the net tree

in defragmentation) from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/ipv4/ip_fragment.c index 921138f6c97c,f44bccc42494.. --- a/net/ipv4

linux-next: build failure after merge of the net-next tree

-function] static int __init ip_tunnel_core_init(void) ^ Caused by commit 3093fbe7ff4b (route: Per route IP tunnel metadata via lightweight tunnel) Forgot to include module.h ... I have used the net-next tree from next-20150722 for today. -- Cheers, Stephen Rothwell

linux-next: manual merge of the net-next tree with the net tree

it up (I removed the br_mdb_notify call as per the former patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line unsubscribe netdev

linux-next: manual merge of the net-next tree with Linus' tree

-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/bridge/br_mdb.c index c11cf2611db0,a8d0e93d43f2.. --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c

linux-next: manual merge of the spi tree with the net-next tree

e spi tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/nfc/trf7970a.c index 123aa981c9d8,4036788c78b6.. --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/tr

linux-next: manual merge of the net-next tree with the net tree

4: Only compute net once in ipmr_forward_finish") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/ipv4/ipmr.c index 8e8203d5c520,fc42525d8694..00

linux-next: manual merge of the net-next tree with the net tree

tion item queue for attr_set and obj_add") ab0690023018 ("net: switchdev: abstract object in add/del ops" from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.o

linux-next: build failure after merge of the net-next tree

;) I have reverted that commit (and the following commit since it may depend on the former) for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org

linux-next: manual merge of the rdma tree with the net-next tree

. They are doing very similar things, but not identical. I fixed it up (see bottom of email and the below extra patch) and can carry the fix as necessary (no action is required unless something more correct is supplied, of course). From: Stephen Rothwell s...@canb.auug.org.au Date: Fri, 28 Aug 2015

Re: [GIT] Networking

t built-in (2015-09-02 16:32:56 > -0700) [just for consistency ...] This has 80 commits that have first been in linux-next on Sept 1 or later (and 5 that have not made it to linux-next yet). I understand that this is part of Dave's work flow and most of these have been queued for a whi

linux-next: build failure after merge of the tip tree

fig change in the tip tree? I have added the following fix patch for today: From: Stephen Rothwell <s...@canb.auug.org.au> Date: Wed, 16 Sep 2015 11:10:16 +1000 Subject: [PATCH] cdc: add header guards Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au> --- include/linux/usb/cdc.h

linux-next: manual merge of the net-next tree with the net tree

X netdev buffer") (among others) from the net-next tree. I fixed it up (I dropped the net tree fixup (assuming that it was fixed in some other manner in the net-next tree)) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells

linux-next: manual merge of the net-next tree with the net tree

h table") from the net-next tree. I fixed it up (the latter rewrote the function, so I dropped the net tree fix) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line

linux-next: manual merge of the net-next tree with the ipsec tree

) from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/ipv6/xfrm6_output.c index be033f22a3f3,4cefda009f53.. --- a/net/ipv6/xfrm6_out

Re: linux-next: build failure after merge of the bluetooth tree

Hi Gustavo, On Mon, 14 Sep 2015 10:22:34 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > On Mon, 14 Sep 2015 10:14:28 +1000 Stephen Rothwell <s...@canb.auug.org.au> > wrote: > > > > I applied the patches that Andrew has had in his post merge seri

linux-next: manual merge of the net-next tree with the net tree

tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/ipv4/arp.c index f03db8b7abee,61ff5ea31283.. --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@@ -651,8 -654,6 +

linux-next: manual merge of the akpm-current tree with the net-next tree

struct") from the net-next tree and commit: c4b672bd7b34 ("net: tcp_memcontrol: simplify linkage between socket and page counter") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

linux-next: manual merge of the akpm-current tree with the net-next tree

ntrol: simplify linkage between socket and page counter") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/net/sock.h index f772b

linux-next: manual merge of the net-next tree with the net tree

he net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/geneve.c index c2b79f5d1c89,0750d7a93878.. --- a/drivers/net/geneve.c +++ b/drivers/net

linux-next: manual merge of the net-next tree with the pci tree

he net-next tree. I fixed it up (the former was just a superset of the latter, so I used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe netdev&

linux-next: manual merge of the rdma tree with the net-next tree

is stuff up, so I have dropped the rdma tree again for today. There is similar functionality being introduced in both trees ... please sort this mess out ... -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe netdev&

linux-next: manual merge of the cgroup tree with the net-next tree

quot;) from the cgroup tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/linux/cgroup.h index 322a28482745,6d0992f3543d.. --- a/include/linux/cgrou

Re: linux-next: manual merge of the rdma tree with the net-next tree

Hi Or, On Tue, 5 Jan 2016 19:05:24 +0200 Or Gerlitz <ogerl...@mellanox.com> wrote: > > On 1/5/2016 3:51 AM, Stephen Rothwell wrote: > > Hi Doug, > > > > Today's linux-next merge of the rdma tree got conflicts in: > > > >drivers/net/ethernet/mellanox/m

linux-next: manual merge of the net-next tree with the net tree

om the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc kernel/bpf/syscall.c index 4a8f3c1d7da6,6d1407bc1531.. --- a/kernel/bpf/syscall.c +++ b/

linux-next: manual merge of the net-next tree with the net tree

) from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/ipv4/ipmr.c index 292123bc30fa,a2d248d9c35c.. --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @

linux-next: manual merge of the net-next tree with the net tree

ainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

linux-next: manual merge of the net-next tree with the arm-soc tree

conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/

linux-next: manual merge of the vhost tree with the net-next tree

the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc tools/virtio/ringtest/Makefile index 50e086c6a7b6,6173adae9f08.. --- a/tools/virtio/ringtest/Makefile +++ b/tools/virtio/ringtest/Makefile @@@ -1,6 -1,6 +1,6 @@@ all: - all:

linux-next: manual merge of the net-next tree with the net tree

your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/vrf.c index 8bd8c7e1ee87,b3762822b653..00

linux-next: manual merge of the net-next tree with the imx-mxs tree

rging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/freescale/fec.h index dc71a88e9c55,92fd5c0bf4df.. --- a/drivers/net/ethernet/f

linux-next: manual merge of the net-next tree with the net tree

with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/sched/sch_netem.c index 178f1630a036,ccca8ca4c722.. --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@@ -650,14 -617,17 +617,17

linux-next: manual merge of the net-next tree with the wireless-drivers tree

port rss queues configuration command") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 0ccc697fef76,070e2af05ca2.. --- a/drivers/net/wi

linux-next: manual merge of the target-merge tree with the net-next tree

SCSI target ULD") from the target-merge tree. I fixed it up (the latter was a superset of the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

linux-next: manual merge of the net-next tree with the net tree

om the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc include/uapi/linux/bpf.h index 5df4881dea7b,6496f98d3d68.. --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@@ -292,9 -321

linux-next: manual merge of the net-next tree with the net tree

3125c081a593 ("net: phy: bcm7xxx: Reduce boilerplate code for 40nm EPHY") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/phy/bcm7xxx.c index db507e3bcab9,9b311041ebfb..

linux-next: build failure after merge of the net-next tree

pport for default application priority.") This build is big endian. I have used the net-next tree from next-20160217 for today. -- Cheers, Stephen Rothwell

linux-next: manual merge of the net-next tree with the net tree

/1512/1514/1518") from the net-next tree. OK, I didn't know how to resolve this, so I just used the net-next tree version (which is probably wrong, but will build). -- Cheers, Stephen Rothwell

linux-next: build warning after merge of the net-next tree

gmp: Namespaceify igmp_llm_reports sysctl knob") 165094afcee7 ("igmp: Namespacify igmp_qrv sysctl knob") CONFIG_IP_MULTICAST is not set for this build. -- Cheers, Stephen Rothwell

linux-next: manual merge of the net-next tree with the net tree

tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/vxlan.c index a31cd954b308,65f52472a52c.. --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@@ -2395,40 -2316,6 +2321,15 @@@ static in

Re: linux-next: manual merge of the target-merge tree with the net-next tree

order doesn't really matter and Linus is cleverer than I am :-) -- Cheers, Stephen Rothwell

linux-next: manual merge of the rdma tree with the net-next tree

t;net/mlx5_core: Introduce forward to next priority action") from the rdma tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c index e848d708d2b7,bf3446794bd5..00

linux-next: manual merge of the net-next tree with Linus' tree

he fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc arch/arm/boot/dts/armada-xp-db.dts index 45813a5526c8,30657302305d.. --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts @@@ -76,8 -76,9 +76,9 @@@ ranges = <M

linux-next: build failure after merge of the net-next tree

by commit 49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type") arm only allows udelay()s up to 2 milliseconds. This commit adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c. -- Cheers, Stephen Rothwell

Re: linux-next: manual merge of the rdma tree with the net-next tree

for merging. You may want also want to > > Only the second want is required. > > > consider cooperate with the maintainer of the conflicting tree to > > cooperating Thanks. Breakfast is not the best time to compose prose :-) -- Cheers, Stephen Rothwell

Re: linux-next: manual merge of the rdma tree with the net-next tree

Hi Linus, On Wed, 16 Mar 2016 10:18:33 -0700 Linus Torvalds <torva...@linux-foundation.org> wrote: > > On Tue, Mar 15, 2016 at 5:58 PM, Stephen Rothwell <s...@canb.auug.org.au> > wrote: > > > > I fixed it up (see below) and can carry the fix as necessary (no act

Re: linux-next: manual merge of the crypto tree with the net-next tree

Hi David, On Mon, 07 Mar 2016 11:08:25 + David Howells <dhowe...@redhat.com> wrote: > > Stephen Rothwell <s...@canb.auug.org.au> wrote: > > > Today's linux-next merge of the crypto tree got a conflict in: > > > > net/rxrpc/rxkad.c > > > &

linux-next: manual merge of the net-next tree with the net tree

g to a separate function") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/vxlan.c index 1c32bd104797,775ddb48388d.. --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @

linux-next: manual merge of the crypto tree with the net-next tree

t;) from the crypto tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc net/rxrpc/rxkad.c index 3106a0c4960b,0d96b48a6492.. --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@@ -128,21 -128,23 +12

linux-next: manual merge of the net-next tree with the net tree

fb1dacdd76 ("net/mlx5e: Support DCBNL IEEE ETS") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 402994bf7e16,5063c0e0f8ac..00

linux-next: manual merge of the net-next tree with the net tree

packet counters") 3c1b5532191d ("net/mlx5e: Move common case counters within sq_stats struct") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx

linux-next: manual merge of the net-next tree with the net tree

teless offloads for tunneling") 89db09eb5979 ("net/mlx5e: Add TX inner packet counters") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/c

linux-next: manual merge of the net-next tree with the net tree

uot;) (and following ones) from the net-next tree. I fixed it up (I used the net-next tree version as it is not obvious tha the net tree patch is still needed) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

Re: linux-next: manual merge of the crypto tree with the net-next tree

Hi David, On Tue, 08 Mar 2016 16:48:07 + David Howells <dhowe...@redhat.com> wrote: > > Stephen Rothwell <s...@canb.auug.org.au> wrote: > > > > What's the best way to deal with this? Should I take Herbert's > > > > > > [PATCH 18/26] rxrp

linux-next: manual merge of the net-next tree with the net tree

with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/macsec.c index c6385617bfb2,a172a1ffa151.. --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@@ -2231,9 -2271,11 +2276,11 @@@ static int nla_put_

linux-next: manual merge of the net-next tree with the net tree

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 67d548b70e14,5bad17d37d7b.. --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main

  1   2   3   4   5   >