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-20131022 tag is also provided for convenience.
Gained a couple new conflicts, fixed more build failures. ARM seems to
be in pretty good shape, as is the 64-bit x86 allmodconfig.
Thierry
Today's linux-next merge of the ipsec-next tree got a conflict in
net/xfrm/xfrm_policy.c
caused by commits e7d8f6c (xfrm: Add refcount handling to queued policies)
and 4d53eff (xfrm: Don't queue retransmitted packets if the original is
still on the host).
I fixed it up (see below). Please verify that the resolution looks good.
Thanks,
Thierry
---
diff --cc net/xfrm/xfrm_policy.c
index 76e1873,e09edfc..9a91f74
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@@ -1842,8 -1831,14 +1842,15 @@@ static int xdst_queue_output(struct sk_
unsigned long sched_next;
struct dst_entry *dst = skb_dst(skb);
struct xfrm_dst *xdst = (struct xfrm_dst *) dst;
- struct xfrm_policy_queue *pq = &xdst->pols[0]->polq;
+ struct xfrm_policy *pol = xdst->pols[0];
+ struct xfrm_policy_queue *pq = &pol->polq;
+ const struct sk_buff *fclone = skb + 1;
+
+ if (unlikely(skb->fclone == SKB_FCLONE_ORIG &&
+ fclone->fclone == SKB_FCLONE_CLONE)) {
+ kfree_skb(skb);
+ return 0;
+ }
if (pq->hold_queue.qlen > XFRM_MAX_QUEUE_LEN) {
kfree_skb(skb);
Today's linux-next merge of the usb tree got a conflict in
drivers/Kconfig
caused by commits ff76496 (drivers: phy: add generic PHY framework) and
12cc4b38 (PowerCap: Add to drivers Kconfig and Makefile).
I fixed it up (see below). Please verify that the resolution look good.
Thanks,
Thierry
---
diff --cc drivers/Kconfig
index 969e987,8f45144..97536a2
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig
source "drivers/fmc/Kconfig"
+source "drivers/powercap/Kconfig"
+
+ source "drivers/phy/Kconfig"
+
endmenu
Today's linux-next merge of the arm tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
caused by commits 1bfa2c4 (DMA-API: net: broadcom/bnx2x: replace
dma_set_mask()+dma_set_coherent_mask() with new helper) and edd3147
(bnx2x: Set NETIF_F_HIGHDMA unconditionally).
I fixed it up (see below). Please verify that the resolution looks good.
Thanks,
Thierry
---
diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index b42f89c,38bf998..767aafb
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -12117,12 -12079,9 +12117,8 @@@ static int bnx2x_set_coherency_mask(str
{
struct device *dev = &bp->pdev->dev;
- if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
- if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
- dev_err(dev, "dma_set_coherent_mask failed, aborting\n");
- return -EIO;
- }
- } else if (dma_set_mask(dev, DMA_BIT_MASK(32)) != 0) {
- if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) == 0) {
- bp->flags |= USING_DAC_FLAG;
- } else if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {
++ if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) != 0 &&
++ dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {
dev_err(dev, "System does not support DMA, aborting\n");
return -EIO;
}
On 10/22/2013 08:08 AM, Thierry Reding wrote:
> Today's linux-next merge of the usb tree got a conflict in
>
> drivers/Kconfig
>
> caused by commits ff76496 (drivers: phy: add generic PHY framework) and
> 12cc4b38 (PowerCap: Add to drivers Kconfig and Makefile).
>
> I fixed it up (see below). Please verify that the resolution look good.
>
> Thanks,
> Thierry
> ---
> diff --cc drivers/Kconfig
> index 969e987,8f45144..97536a2
> --- a/drivers/Kconfig
> +++ b/drivers/Kconfig
> @@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig
>
> source "drivers/fmc/Kconfig"
>
> +source "drivers/powercap/Kconfig"
> +
Look OK.
> + source "drivers/phy/Kconfig"
> +
> endmenu
Thanks,
Srinivas
On Tue, Oct 22, 2013 at 05:08:34PM +0200, Thierry Reding wrote:
> 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-20131022 tag is also provided for convenience.
>
> Gained a couple new conflicts, fixed more build failures. ARM seems to
> be in pretty good shape, as is the 64-bit x86 allmodconfig.
>
x86_64:defconfig, i386:allyesconfig and i386:allmodconfig fail to build.
lib/built-in.o: In function `trace_swiotlb_bounced':
include/trace/events/swiotlb.h:9: undefined reference to `__tracepoint_swiotlb_bounced'
and
lib/built-in.o: In function `swiotlb_map_page':
(.text+0x10c94): undefined reference to `__tracepoint_swiotlb_bounced'
arm:allmodconfig fails as well, currently with
arch/arm/common/bL_switcher.c: In function 'bL_switcher_enable':
arch/arm/common/bL_switcher.c:580:2: error: implicit declaration of function
'cpu_hotplug_driver_lock' [-Werror=implicit-function-declaration]
arch/arm/common/bL_switcher.c:582:3: error: implicit declaration of function
'cpu_hotplug_driver_unlock' [-Werror=implicit-function-declaration]
Overall, failures are up to
total: 110 pass: 88 skipped: 4 fail: 18
from 14 failures yesterday.
Guenter
On 10/22/13 08:08, Thierry Reding wrote:
> 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-20131022 tag is also provided for convenience.
>
> Gained a couple new conflicts, fixed more build failures. ARM seems to
> be in pretty good shape, as is the 64-bit x86 allmodconfig.
on i386:
CC [M] drivers/tty/serial/xilinx_uartps.o
drivers/tty/serial/xilinx_uartps.c: In function 'xuartps_suspend':
drivers/tty/serial/xilinx_uartps.c:1227:21: error: 'xuartps_uart_driver' undeclared (first use in this function)
drivers/tty/serial/xilinx_uartps.c:1227:21: note: each undeclared identifier is reported only once for each function it appears in
drivers/tty/serial/xilinx_uartps.c: In function 'xuartps_resume':
drivers/tty/serial/xilinx_uartps.c:1308:27: error: 'xuartps_uart_driver' undeclared (first use in this function)
drivers/tty/serial/xilinx_uartps.c:1309:1: warning: control reaches end of non-void function [-Wreturn-type]
Full randconfig file is attached.
--
~Randy
On 10/22/13 08:08, Thierry Reding wrote:
> 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-20131022 tag is also provided for convenience.
>
> Gained a couple new conflicts, fixed more build failures. ARM seems to
> be in pretty good shape, as is the 64-bit x86 allmodconfig.
on x86_64:
crypto/built-in.o: In function `RSA_verify_signature':
rsa.c:(.text+0x4372c): undefined reference to `mpi_get_nbits'
rsa.c:(.text+0x43738): undefined reference to `mpi_get_nbits'
rsa.c:(.text+0x43777): undefined reference to `mpi_cmp_ui'
rsa.c:(.text+0x437a3): undefined reference to `mpi_cmp'
rsa.c:(.text+0x437c3): undefined reference to `mpi_alloc'
rsa.c:(.text+0x437fd): undefined reference to `mpi_powm'
rsa.c:(.text+0x43822): undefined reference to `mpi_free'
rsa.c:(.text+0x43890): undefined reference to `mpi_get_nbits'
rsa.c:(.text+0x438cf): undefined reference to `mpi_get_buffer'
rsa.c:(.text+0x43b0c): undefined reference to `mpi_free'
Full randconfig file is attached.
--
~Randy
On Tue, Oct 22, 2013 at 03:04:08PM -0700, Randy Dunlap wrote:
> On 10/22/13 08:08, Thierry Reding wrote:
> > 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-20131022 tag is also provided for convenience.
> >
> > Gained a couple new conflicts, fixed more build failures. ARM seems to
> > be in pretty good shape, as is the 64-bit x86 allmodconfig.
>
>
> on i386:
>
> CC [M] drivers/tty/serial/xilinx_uartps.o
> drivers/tty/serial/xilinx_uartps.c: In function 'xuartps_suspend':
> drivers/tty/serial/xilinx_uartps.c:1227:21: error: 'xuartps_uart_driver' undeclared (first use in this function)
> drivers/tty/serial/xilinx_uartps.c:1227:21: note: each undeclared identifier is reported only once for each function it appears in
> drivers/tty/serial/xilinx_uartps.c: In function 'xuartps_resume':
> drivers/tty/serial/xilinx_uartps.c:1308:27: error: 'xuartps_uart_driver' undeclared (first use in this function)
> drivers/tty/serial/xilinx_uartps.c:1309:1: warning: control reaches end of non-void function [-Wreturn-type]
There are some patches sent that should resolve this issue now, I'll try
to apply them later today.
thanks,
greg k-h
> -----Original Message-----
> From: [email protected] [mailto:netdev-
> [email protected]] On Behalf Of Thierry Reding
> Sent: Tuesday, October 22, 2013 6:09 PM
> To: Russell King; Merav Sicron; David Miller; [email protected]
> Cc: [email protected]; [email protected]
> Subject: linux-next: manual merge of the arm tree
>
> Today's linux-next merge of the arm tree got a conflict in
>
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
>
> caused by commits 1bfa2c4 (DMA-API: net: broadcom/bnx2x: replace
> dma_set_mask()+dma_set_coherent_mask() with new helper) and edd3147
> (bnx2x: Set NETIF_F_HIGHDMA unconditionally).
>
> I fixed it up (see below). Please verify that the resolution looks good.
>
> Thanks,
> Thierry
> ---
> diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
> index b42f89c,38bf998..767aafb
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
> @@@ -12117,12 -12079,9 +12117,8 @@@ static int
> bnx2x_set_coherency_mask(str
> {
> struct device *dev = &bp->pdev->dev;
>
> - if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
> - if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
> - dev_err(dev, "dma_set_coherent_mask failed,
> aborting\n");
> - return -EIO;
> - }
> - } else if (dma_set_mask(dev, DMA_BIT_MASK(32)) != 0) {
> - if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) == 0) {
> - bp->flags |= USING_DAC_FLAG;
> - } else if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) !=
> 0) {
> ++ if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) != 0 &&
> ++ dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {
> dev_err(dev, "System does not support DMA, aborting\n");
> return -EIO;
> }
The fix is correct. Thanks, Thierry.
Acked-by: Dmitry Kravkov <[email protected]>