* linux-next: manual merge of the gpio tree with the arm64 tree
From: Stephen Rothwell @ 2016-09-05 7:53 UTC (permalink / raw)
To: Linus Walleij, Catalin Marinas
Cc: linux-next, linux-kernel, Masahiro Yamada, Will Deacon
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
arch/arm64/Kconfig.platforms
between commit:
67060ed148cc ("arm64: remove redundant "select HAVE_CLK"")
from the arm64 tree and commit:
da9a1c676754 ("arm64: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
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/Kconfig.platforms
index 4e0e1071f2e8,4fb0bef0f094..000000000000
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -163,9 -158,9 +162,10 @@@ config ARCH_TEGR
select CLKSRC_MMIO
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
+ select GPIOLIB
- select HAVE_CLK
select PINCTRL
+ select PM
+ select PM_GENERIC_DOMAINS
select RESET_CONTROLLER
help
This enables support for the NVIDIA Tegra SoC family.
^ permalink raw reply
* linux-next: manual merge of the char-misc tree with the net-next tree
From: Stephen Rothwell @ 2016-09-05 6:56 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, David Miller, Networking
Cc: linux-next, linux-kernel, Stephen Hemminger, Vitaly Kuznetsov,
K. Y. Srinivasan
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
include/linux/hyperv.h
between commit:
30d1de08c87d ("hv_netvsc: make inline functions static")
from the net-next tree and commit:
bb08d431a914 ("Drivers: hv: ring_buffer: count on wrap around mappings in get_next_pkt_raw()")
from the char-misc tree.
I fixed it up (the former moved the code modified by the latter, so the
below patch applies to the new location of the code) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial 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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Sep 2016 16:53:06 +1000
Subject: [PATCH] Drivers: hv: ring_buffer: merge fix up for "hv_netvsc: make
inline functions static"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/hyperv/netvsc.c | 32 +++++++++++---------------------
1 file changed, 11 insertions(+), 21 deletions(-)
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 2a9ccc4d9e3c..026df6556068 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -42,31 +42,23 @@ static struct vmpacket_descriptor *
get_next_pkt_raw(struct vmbus_channel *channel)
{
struct hv_ring_buffer_info *ring_info = &channel->inbound;
- u32 read_loc = ring_info->priv_read_index;
+ u32 priv_read_loc = ring_info->priv_read_index;
void *ring_buffer = hv_get_ring_buffer(ring_info);
- struct vmpacket_descriptor *cur_desc;
- u32 packetlen;
u32 dsize = ring_info->ring_datasize;
- u32 delta = read_loc - ring_info->ring_buffer->read_index;
+ /*
+ * delta is the difference between what is available to read and
+ * what was already consumed in place. We commit read index after
+ * the whole batch is processed.
+ */
+ u32 delta = priv_read_loc >= ring_info->ring_buffer->read_index ?
+ priv_read_loc - ring_info->ring_buffer->read_index :
+ (dsize - ring_info->ring_buffer->read_index) + priv_read_loc;
u32 bytes_avail_toread = (hv_get_bytes_to_read(ring_info) - delta);
if (bytes_avail_toread < sizeof(struct vmpacket_descriptor))
return NULL;
- if ((read_loc + sizeof(*cur_desc)) > dsize)
- return NULL;
-
- cur_desc = ring_buffer + read_loc;
- packetlen = cur_desc->len8 << 3;
-
- /*
- * If the packet under consideration is wrapping around,
- * return failure.
- */
- if ((read_loc + packetlen + VMBUS_PKT_TRAILER) > (dsize - 1))
- return NULL;
-
- return cur_desc;
+ return ring_buffer + priv_read_loc;
}
/*
@@ -78,16 +70,14 @@ static void put_pkt_raw(struct vmbus_channel *channel,
struct vmpacket_descriptor *desc)
{
struct hv_ring_buffer_info *ring_info = &channel->inbound;
- u32 read_loc = ring_info->priv_read_index;
u32 packetlen = desc->len8 << 3;
u32 dsize = ring_info->ring_datasize;
- BUG_ON((read_loc + packetlen + VMBUS_PKT_TRAILER) > dsize);
-
/*
* Include the packet trailer.
*/
ring_info->priv_read_index += packetlen + VMBUS_PKT_TRAILER;
+ ring_info->priv_read_index %= dsize;
}
/*
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the tty tree with the slave-dma tree
From: Stephen Rothwell @ 2016-09-05 6:43 UTC (permalink / raw)
To: Greg KH, Vinod Koul; +Cc: linux-next, linux-kernel, Nandor Han, Dave Jiang
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
drivers/dma/imx-sdma.c
between commit:
48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
from the slave-dma tree and commit:
15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
from the tty tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
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 drivers/dma/imx-sdma.c
index a6bffbc47ee2,3cb47386fbb9..000000000000
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -689,12 -664,36 +686,35 @@@ static void sdma_update_channel_loop(st
if (bd->mode.status & BD_DONE)
break;
- if (bd->mode.status & BD_RROR)
+ if (bd->mode.status & BD_RROR) {
+ bd->mode.status &= ~BD_RROR;
sdmac->status = DMA_ERROR;
+ error = -EIO;
+ }
+ /*
+ * We use bd->mode.count to calculate the residue, since contains
+ * the number of bytes present in the current buffer descriptor.
+ */
+
+ sdmac->chn_real_count = bd->mode.count;
bd->mode.status |= BD_DONE;
+ bd->mode.count = sdmac->period_len;
+
+ /*
+ * The callback is called from the interrupt context in order
+ * to reduce latency and to avoid the risk of altering the
+ * SDMA transaction status by the time the client tasklet is
+ * executed.
+ */
+
- if (sdmac->desc.callback)
- sdmac->desc.callback(sdmac->desc.callback_param);
++ dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL);
+
sdmac->buf_tail++;
sdmac->buf_tail %= sdmac->num_bd;
+
+ if (error)
+ sdmac->status = old_status;
}
}
@@@ -722,20 -722,10 +743,10 @@@ static void mxc_sdma_handle_channel_nor
sdmac->status = DMA_COMPLETE;
dma_cookie_complete(&sdmac->desc);
- if (sdmac->desc.callback)
- sdmac->desc.callback(sdmac->desc.callback_param);
+
+ dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL);
}
- static void sdma_tasklet(unsigned long data)
- {
- struct sdma_channel *sdmac = (struct sdma_channel *) data;
-
- if (sdmac->flags & IMX_DMA_SG_LOOP)
- sdma_handle_channel_loop(sdmac);
- else
- mxc_sdma_handle_channel_normal(sdmac);
- }
-
static irqreturn_t sdma_int_handler(int irq, void *dev_id)
{
struct sdma_engine *sdma = dev_id;
^ permalink raw reply
* linux-next: manual merge of the md tree with the s390 tree
From: Stephen Rothwell @ 2016-09-05 4:56 UTC (permalink / raw)
To: Shaohua Li, Martin Schwidefsky, Heiko Carstens
Cc: linux-next, linux-kernel, Gayatri Kammela, Megha Dey
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
include/linux/raid/pq.h
between commit:
f5b55fa1f81d ("RAID/s390: provide raid6 recovery optimization")
from the s390 tree and commit:
a5e49b04af05 ("lib/raid6: Add AVX512 optimized recovery functions")
from the md tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
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 include/linux/raid/pq.h
index 395a4c674168,1abd89584568..000000000000
--- a/include/linux/raid/pq.h
+++ b/include/linux/raid/pq.h
@@@ -102,8 -102,10 +102,11 @@@ extern const struct raid6_calls raid6_a
extern const struct raid6_calls raid6_avx2x1;
extern const struct raid6_calls raid6_avx2x2;
extern const struct raid6_calls raid6_avx2x4;
+ extern const struct raid6_calls raid6_avx512x1;
+ extern const struct raid6_calls raid6_avx512x2;
+ extern const struct raid6_calls raid6_avx512x4;
extern const struct raid6_calls raid6_tilegx8;
+extern const struct raid6_calls raid6_s390vx8;
struct raid6_recov_calls {
void (*data2)(int, size_t, int, int, void **);
@@@ -116,7 -118,7 +119,8 @@@
extern const struct raid6_recov_calls raid6_recov_intx1;
extern const struct raid6_recov_calls raid6_recov_ssse3;
extern const struct raid6_recov_calls raid6_recov_avx2;
+ extern const struct raid6_recov_calls raid6_recov_avx512;
+extern const struct raid6_recov_calls raid6_recov_s390xc;
extern const struct raid6_calls raid6_neonx1;
extern const struct raid6_calls raid6_neonx2;
^ permalink raw reply
* linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell @ 2016-09-05 3:58 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Christian König, Alex Deucher
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu.h
between commit:
566153874951 ("drm/amdgpu: fix lru size grouping v2")
from Linus' tree and commit:
c632d7994360 ("amdgpu: move ttm stuff to amdgpu_ttm.h")
from the drm tree.
I fixed it up (the code move was fixed up in another commit, so I just
removed the former change to this file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial 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
^ permalink raw reply
* linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell @ 2016-09-05 3:51 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-next, linux-kernel, Daniel Vetter, Michel Dänzer,
Alex Deucher
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_crtc.c
between commit:
6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET")
from Linus' tree and commit:
f837297ad824 ("drm: Add DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags v2")
from the drm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
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 drivers/gpu/drm/drm_crtc.c
index ddebe54cd5ca,a33dab27bb0d..000000000000
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -5402,13 -1915,19 +1915,22 @@@ int drm_mode_page_flip_ioctl(struct drm
struct drm_crtc *crtc;
struct drm_framebuffer *fb = NULL;
struct drm_pending_vblank_event *e = NULL;
+ u32 target_vblank = page_flip->sequence;
int ret = -EINVAL;
+ if (!drm_core_check_feature(dev, DRIVER_MODESET))
+ return -EINVAL;
+
- if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS ||
- page_flip->reserved != 0)
+ if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS)
+ return -EINVAL;
+
+ if (page_flip->sequence != 0 && !(page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET))
+ return -EINVAL;
+
+ /* Only one of the DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags
+ * can be specified
+ */
+ if ((page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET) == DRM_MODE_PAGE_FLIP_TARGET)
return -EINVAL;
if ((page_flip->flags & DRM_MODE_PAGE_FLIP_ASYNC) && !dev->mode_config.async_page_flip)
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-09-05 3:10 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Sean Wang, Nelson Chang, Wei Yongjun
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
between commits:
d3bd1ce4db8e ("net: ethernet: mediatek: remove redundant free_irq for devm_request_irq allocated irq")
7c6b0d76fa02 ("net: ethernet: mediatek: fix logic unbalance between probe and remove")
from the net tree and commits:
45d339309f49 ("net: mediatek: remove unnecessary platform_set_drvdata()")
bacfd110e059 ("net: ethernet: mediatek: modify to use the PDMA instead of the QDMA for Ethernet RX")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
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 drivers/net/ethernet/mediatek/mtk_eth_soc.c
index d9199151a83e,2dadfa961898..000000000000
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@@ -334,9 -338,12 +334,10 @@@ static void mtk_mdio_cleanup(struct mtk
return;
mdiobus_unregister(eth->mii_bus);
- of_node_put(eth->mii_bus->dev.of_node);
- mdiobus_free(eth->mii_bus);
}
- static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask)
+ static inline void mtk_irq_disable(struct mtk_eth *eth,
+ unsigned reg, u32 mask)
{
unsigned long flags;
u32 val;
@@@ -1501,7 -1513,11 +1508,8 @@@ static void mtk_uninit(struct net_devic
struct mtk_eth *eth = mac->hw;
phy_disconnect(mac->phy_dev);
- mtk_irq_disable(eth, ~0);
- mtk_mdio_cleanup(eth);
+ mtk_irq_disable(eth, MTK_QDMA_INT_MASK, ~0);
+ mtk_irq_disable(eth, MTK_PDMA_INT_MASK, ~0);
- free_irq(eth->irq[1], dev);
- free_irq(eth->irq[2], dev);
}
static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@@ -1913,8 -1920,6 +1921,7 @@@ static int mtk_remove(struct platform_d
netif_napi_del(ð->tx_napi);
netif_napi_del(ð->rx_napi);
mtk_cleanup(eth);
+ mtk_mdio_cleanup(eth);
- platform_set_drvdata(pdev, NULL);
return 0;
}
^ permalink raw reply
* linux-next: manual merge of the btrfs-kdave tree with Linus' tree
From: Stephen Rothwell @ 2016-09-05 1:47 UTC (permalink / raw)
To: David Sterba; +Cc: linux-next, linux-kernel, Josef Bacik
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/send.c
between commit:
3dc09ec895f0 ("Btrfs: kill invalid ASSERT() in process_all_refs()")
from Linus' tree and commit:
8e991cbbea49 ("Btrfs: handle pending renames with recycled inodes properly")
from the btrfs-kdave tree.
I fixed it up (I just used the latter version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial 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
^ permalink raw reply
* linux-next: manual merge of the arm64 tree with Linus' tree
From: Stephen Rothwell @ 2016-09-05 1:27 UTC (permalink / raw)
To: Catalin Marinas
Cc: linux-next, linux-kernel, Mark Rutland, Ard Biesheuvel,
Will Deacon
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/kernel/head.S
between commit:
fd363bd417dd ("arm64: avoid TLB conflict with CONFIG_RANDOMIZE_BASE")
from Linus' tree and commit:
3c5e9f238bc4 ("arm64: head.S: move KASLR processing out of __enable_mmu()")
from the arm64 tree.
I fixed it up (the latter included the former change, so I just used that)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial 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
^ permalink raw reply
* linux-next: manual merge of the samsung-krzk tree with the arm-soc tree
From: Stephen Rothwell @ 2016-09-05 1:19 UTC (permalink / raw)
To: Krzysztof Kozlowski, Olof Johansson, Arnd Bergmann, ARM
Cc: linux-next, linux-kernel, Marc Zyngier
Hi Krzysztof,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm64/boot/dts/exynos/exynos7.dtsi
between commit:
585dcacac6bb ("arm64: dts: Fix broken architected timer interrupt trigger")
from the arm-soc tree and commit:
36d1c9cd07cd ("arm64: dts: exynos: Use human-friendly symbols for timer interrupt flags")
from the samsung-krzk tree.
I fixed it up (I *think* - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial 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/dts/exynos/exynos7.dtsi
index 162831546e18,8d7ce97c0ddb..000000000000
--- a/arch/arm64/boot/dts/exynos/exynos7.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos7.dtsi
@@@ -473,10 -474,14 +474,14 @@@
timer {
compatible = "arm,armv8-timer";
- interrupts = <1 13 0xff08>,
- <1 14 0xff08>,
- <1 11 0xff08>,
- <1 10 0xff08>;
+ interrupts = <GIC_PPI 13
- (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,
++ (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 14
- (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,
++ (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 11
- (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>,
++ (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 10
- (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_EDGE_RISING)>;
++ (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
};
pmu_system_controller: system-controller@105c0000 {
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with Linus' tree
From: Stephen Rothwell @ 2016-09-05 0:58 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM
Cc: linux-next, linux-kernel, Russell King, David S. Miller,
Linus Walleij
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/mach-realview/core.c
between commit:
2fb04fdf3019 ("net: smc91x: fix SMC accesses")
from Linus' tree and commit:
7484c727b636 ("ARM: realview: delete the RealView board files")
from the arm-soc tree.
I fixed it up (I deleted the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial 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
^ permalink raw reply
* Re: linux-next: Tree for Jun 6 (scsi_debug.c)
From: Randy Dunlap @ 2016-09-02 15:40 UTC (permalink / raw)
To: Masanari Iida
Cc: Stephen Rothwell, linux-next, linux-kernel@vger.kernel.org,
linux-scsi
In-Reply-To: <CALLJCT0r7FfL=rLARTV9-YB-x10d1w0hYMOO6BC-dv8zGC4VLA@mail.gmail.com>
On 08/23/16 16:22, Masanari Iida wrote:
> This one still exist on linus's tree (as of v4.8-rc3).
>
> CALL scripts/checksyscalls.sh
> CHK kernel/config_data.h
> Building modules, stage 2.
> MODPOST 720 modules
> ERROR: "ip_compute_csum" [drivers/scsi/scsi_debug.ko] undefined!
> scripts/Makefile.modpost:91: recipe for target '__modpost' failed
> make[1]: *** [__modpost] Error 1
> Makefile:1178: recipe for target 'modules' failed
> make: *** [modules] Error 2
>
> Masanari
Hi,
Do you have the kernel .config file that causes this?
I can no longer reproduce it.
What $arch did you build on?
Thanks.
> On Tue, Jun 7, 2016 at 12:10 PM, Randy Dunlap <rdunlap@infradead.org> wrote:
>> On 06/05/16 21:20, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20160603:
>>
>> on x86_64:
>>
>> ERROR: "ip_compute_csum" [drivers/scsi/scsi_debug.ko] undefined!
>>
>> CONFIG_GENERIC_CSUM doesn't seem to exist for x86, so lib/checksum.o is not built.
>>
>>
>> --
>> ~Randy
--
~Randy
^ permalink raw reply
* mmotm 2016-08-31-16-06 uploaded
From: akpm @ 2016-08-31 23:07 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-08-31-16-06 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.8-rc4:
(patches marked "*" will be included in linux-next)
origin.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
* mm-oom-prevent-pre-mature-oom-killer-invocation-for-high-order-request.patch
* mm-page_alloc-replace-set_dma_reserve-to-set_memory_reserve.patch
* stackdepot-fix-mempolicy-use-after-free.patch
* kexec-fix-double-free-when-failing-to-relocate-the-purgatory.patch
* kconfig-tinyconfig-provide-whole-choice-blocks-to-avoid-warnings.patch
* test-hash-fix-warning-in-two-dimensional-array-init.patch
* test-hash-fix-warning-in-preprocessor-symbol-evaluation.patch
* mm-vmscan-only-allocate-and-reclaim-from-zones-with-pages-managed-by-the-buddy-allocator.patch
* wd719x-remove-last-declaration-using-define_pci_device_table.patch
* treewide-remove-references-to-the-now-unnecessary-define_pci_device_table.patch
* printk-nmi-avoid-direct-printk-s-from-__printk_nmi_flush.patch
* mm-mempolicy-task-mempolicy-must-be-null-before-dropping-final-reference.patch
* maintainers-update-my-e-mail-address.patch
* kernel-fork-fix-clone_child_cleartid-regression-in-nscd.patch
* mm-slab-improve-performance-of-gathering-slabinfo-stats.patch
* kthread-rename-probe_kthread_data-to-kthread_probe_data.patch
* kthread-kthread-worker-api-cleanup.patch
* kthread-smpboot-do-not-park-in-kthread_create_on_cpu.patch
* kthread-allow-to-call-__kthread_create_on_node-with-va_list-args.patch
* kthread-add-kthread_create_worker.patch
* kthread-add-kthread_destroy_worker.patch
* kthread-detect-when-a-kthread-work-is-used-by-more-workers.patch
* kthread-initial-support-for-delayed-kthread-work.patch
* kthread-allow-to-cancel-kthread-work.patch
* kthread-allow-to-modify-delayed-kthread-work.patch
* kthread-better-support-freezable-kthread-workers.patch
* kthread-add-kerneldoc-for-kthread_create.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* kbuild-simpler-generation-of-assembly-constants.patch
* fs-ocfs2-dlmfs-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-cluster-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-super-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-dlm-remove-deprecated-create_singlethread_workqueue.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
mm.patch
* mm-oom-deduplicate-victim-selection-code-for-memcg-and-global-oom.patch
* mm-zsmalloc-add-trace-events-for-zs_compact.patch
* mm-zsmalloc-add-per-class-compact-trace-event.patch
* mm-vmalloc-fix-align-value-calculation-error.patch
* mm-vmalloc-fix-align-value-calculation-error-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix.patch
* mm-memcontrol-add-sanity-checks-for-memcg-idref-on-get-put.patch
* mm-oom_killc-fix-task_will_free_mem-comment.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
* mm-compaction-cleanup-unused-functions.patch
* mm-compaction-rename-compact_partial-to-compact_success.patch
* mm-compaction-dont-recheck-watermarks-after-compact_success.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority-fix.patch
* mm-compaction-use-correct-watermark-when-checking-compaction-success.patch
* mm-compaction-create-compact_gap-wrapper.patch
* mm-compaction-create-compact_gap-wrapper-fix.patch
* mm-compaction-use-proper-alloc_flags-in-__compaction_suitable.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders-fix.patch
* mm-vmscan-make-compaction_ready-more-accurate-and-readable.patch
* mem-hotplug-fix-node-spanned-pages-when-we-have-a-movable-node.patch
* mm-fix-set-pageblock-migratetype-in-deferred-struct-page-init.patch
* mm-vmscan-get-rid-of-throttle_vm_writeout.patch
* mm-debug_pagealloc-clean-up-guard-page-handling-code.patch
* mm-debug_pagealloc-dont-allocate-page_ext-if-we-dont-use-guard-page.patch
* mm-page_owner-move-page_owner-specific-function-to-page_ownerc.patch
* mm-page_ext-rename-offset-to-index.patch
* mm-page_ext-support-extra-space-allocation-by-page_ext-user.patch
* mm-page_owner-dont-define-fields-on-struct-page_ext-by-hard-coding.patch
* do_generic_file_read-fail-immediately-if-killed.patch
* mm-pagewalk-fix-the-comment-for-test_walk.patch
* mm-unrig-vma-cache-hit-ratio.patch
* mm-swap-add-swap_cluster_list.patch
* mm-swap-add-swap_cluster_list-checkpatch-fixes.patch
* mmoom_reaper-reduce-find_lock_task_mm-usage.patch
* mmoom_reaper-do-not-attempt-to-reap-a-task-twice.patch
* oom-keep-mm-of-the-killed-task-available.patch
* kernel-oom-fix-potential-pgd_lock-deadlock-from-__mmdrop.patch
* mm-oom-get-rid-of-signal_struct-oom_victims.patch
* oom-suspend-fix-oom_killer_disable-vs-pm-suspend-properly.patch
* mm-oom-enforce-exit_oom_victim-on-current-task.patch
* mm-make-sure-that-kthreads-will-not-refault-oom-reaped-memory.patch
* oom-oom_reaper-allow-to-reap-mm-shared-by-the-kthreads.patch
* mm-use-zonelist-name-instead-of-using-hardcoded-index.patch
* mm-introduce-arch_reserved_kernel_pages.patch
* mm-memblock-expose-total-reserved-memory.patch
* powerpc-implement-arch_reserved_kernel_pages.patch
* mm-nobootmemc-remove-duplicate-macro-arch_low_address_limit-statements.patch
* mm-bootmemc-replace-kzalloc-by-kzalloc_node.patch
* mm-dont-use-radix-tree-writeback-tags-for-pages-in-swap-cache.patch
* mm-check-that-we-havent-used-more-than-32-bits-in-address_spaceflags.patch
* oom-warn-if-we-go-oom-for-higher-order-and-compaction-is-disabled.patch
* mm-mlock-check-against-vma-for-actual-mlock-size.patch
* mm-mlock-check-against-vma-for-actual-mlock-size-fix.patch
* mm-mlock-avoid-increase-mm-locked_vm-on-mlock-when-already-mlock2mlock_onfault.patch
* selftest-split-mlock2_-funcs-into-separate-mlock2h.patch
* selftests-vm-add-test-for-mlock-when-areas-are-intersected.patch
* thp-dax-add-thp_get_unmapped_area-for-pmd-mappings.patch
* ext2-4-xfs-call-thp_get_unmapped_area-for-pmd-mappings.patch
* cpu-fix-node-state-for-whether-it-contains-cpu.patch
* mm-proc-make-the-task_mmu-walk_page_range-limit-in-clear_refs_write-obvious.patch
* thp-reduce-usage-of-huge-zero-pages-atomic-counter.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* proc-much-faster-proc-vmstat.patch
* proc-faster-proc-status.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
* meminfo-break-apart-a-very-long-seq_printf-with-ifdefs.patch
* proc-relax-proc-tid-timerslack_ns-capability-requirements.patch
* proc-add-lsm-hook-checks-to-proc-tid-timerslack_ns.patch
* proc-fix-timerslack_ns-cap_sys_nice-check-when-adjusting-self.patch
* min-max-remove-sparse-warnings-when-theyre-nested.patch
* nmi_backtrace-add-more-trigger__cpu_backtrace-methods.patch
* nmi_backtrace-do-a-local-dump_stack-instead-of-a-self-nmi.patch
* arch-tile-adopt-the-new-nmi_backtrace-framework.patch
* nmi_backtrace-generate-one-line-reports-for-idle-cpus.patch
* spellingtxt-modeled-is-spelt-correctly.patch
* cred-simpler-1d-supplementary-groups.patch
* console-dont-prefer-first-registered-if-dt-specifies-stdout-path.patch
* radix-tree-slot-can-be-null-in-radix_tree_next_slot.patch
* radix-tree-tests-add-iteration-test.patch
* radix-tree-tests-properly-initialize-mutex.patch
* lib-harden-strncpy_from_user.patch
* make-isdigit-table-lookupless.patch
* kstrtox-smaller-_parse_integer.patch
* lib-add-crc64-ecma-module.patch
* compat-remove-compat_printk.patch
* checkpatch-see-if-modified-files-are-marked-obsolete-in-maintainers.patch
* checkpatch-look-for-symbolic-permissions-and-suggest-octal-instead.patch
* checkpatch-test-multiple-line-block-comment-alignment.patch
* checkpatch-dont-test-for-prefer-ether_addr_foo.patch
* checkpatch-externalize-the-structs-that-should-be-const.patch
* const_structscheckpatch-add-frequently-used-from-julia-lawalls-list.patch
* autofs-fix-typos-in-documentation-filesystems-autofs4txt.patch
* autofs-drop-unnecessary-extern-in-autofs_ih.patch
* autofs-test-autofs-versions-first-on-sb-initialization.patch
* autofs-fix-autofs4_fill_super-error-exit-handling.patch
* autofs-add-warn_on1-for-non-dir-link-inode-case.patch
* autofs-remove-ino-free-in-autofs4_dir_symlink.patch
* autofs-use-autofs4_free_ino-to-kfree-dentry-data.patch
* autofs-remove-obsolete-sb-fields.patch
* autofs-dont-fail-to-free_dev_ioctlparam.patch
* autofs-remove-autofs_devid_len.patch
* autofs-fix-documentation-regarding-devid-on-ioctl.patch
* autofs-update-struct-autofs_dev_ioctl-in-documentation.patch
* autofs-fix-pr_debug-message.patch
* autofs-fix-dev-ioctl-number-range-check.patch
* autofs-fix-dev-ioctl-number-range-check-fix.patch
* autofs-add-autofs_dev_ioctl_version-for-autofs_dev_ioctl_version_cmd.patch
* autofs-fix-print-format-for-ioctl-warning-message.patch
* autofs-move-inclusion-of-linux-limitsh-to-uapi.patch
* autofs4-move-linux-auto_dev-ioctlh-to-uapi-linux.patch
* autofs-remove-possibly-misleading-define-debug.patch
* autofs-refactor-ioctl-fn-vector-in-iookup_dev_ioctl.patch
* pipe-relocate-round_pipe_size-above-pipe_set_size.patch
* pipe-move-limit-checking-logic-into-pipe_set_size.patch
* pipe-refactor-argument-for-account_pipe_buffers.patch
* pipe-fix-limit-checking-in-pipe_set_size.patch
* pipe-simplify-logic-in-alloc_pipe_info.patch
* pipe-fix-limit-checking-in-alloc_pipe_info.patch
* pipe-make-account_pipe_buffers-return-a-value-and-use-it.patch
* pipe-cap-initial-pipe-capacity-according-to-pipe-max-size-limit.patch
* kexec_file-allow-arch-specific-memory-walking-for-kexec_add_buffer.patch
* kexec_file-change-kexec_add_buffer-to-take-kexec_buf-as-argument.patch
* kexec_file-factor-out-kexec_locate_mem_hole-from-kexec_add_buffer.patch
* powerpc-change-places-using-config_kexec-to-use-config_kexec_core-instead.patch
* powerpc-factor-out-relocation-code-from-module_64c-to-elf_util_64c.patch
* powerpc-generalize-elf64_apply_relocate_add.patch
* powerpc-adapt-elf64_apply_relocate_add-for-kexec_file_load.patch
* powerpc-add-functions-to-read-elf-files-of-any-endianness.patch
* powerpc-implement-kexec_file_load.patch
* powerpc-add-code-to-work-with-device-trees-in-kexec_file_load.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation.patch
* powerpc-enable-config_kexec_file-in-powerpc-server-defconfigs.patch
* kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* powerpc-kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* kexec_file-allow-skipping-checksum-calculation-for-some-segments.patch
* kexec_file-add-mechanism-to-update-kexec-segments.patch
* ima-on-soft-reboot-restore-the-measurement-list.patch
* ima-permit-duplicate-measurement-list-entries.patch
* ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
* ima-serialize-the-binary_runtime_measurements.patch
* ima-on-soft-reboot-save-the-measurement-list.patch
* ima-store-the-builtin-custom-template-definitions-in-a-list.patch
* ima-support-restoring-multiple-template-formats.patch
* ima-define-a-canonical-binary_runtime_measurements-list-format.patch
* ima-platform-independent-hash-value.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-rio_cm-use-memdup_user-instead-of-duplicating-code.patch
* random-simplify-api-for-random-address-requests.patch
* x86-use-simpler-api-for-random-address-requests.patch
* arm-use-simpler-api-for-random-address-requests.patch
* arm64-use-simpler-api-for-random-address-requests.patch
* tile-use-simpler-api-for-random-address-requests.patch
* unicore32-use-simpler-api-for-random-address-requests.patch
* random-remove-unused-randomize_range.patch
* dma-mapping-introduce-the-dma_attr_no_warn-attribute.patch
* powerpc-implement-the-dma_attr_no_warn-attribute.patch
* nvme-use-the-dma_attr_no_warn-attribute.patch
* x86-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* mips-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* relay-use-per-cpu-constructs-for-the-relay-channel-buffer-pointers.patch
* config-android-remove-config_ipv6_privacy.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msg-implement-lockless-pipelined-wakeups.patch
* ipc-msg-batch-queue-sender-wakeups.patch
* ipc-msg-make-ss_wakeup-kill-arg-boolean.patch
* ipc-msg-lockless-security-checks-for-msgsnd.patch
* ipc-msg-avoid-waking-sender-upon-full-queue.patch
* ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
linux-next.patch
linux-next-git-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* include-linux-mlx5-deviceh-kill-build_bug_ons.patch
* kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* mm-kmemleak-avoid-using-__va-on-addresses-that-dont-have-a-lowmem-mapping.patch
* enable-code-completion-in-vim.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* crypto: xor - Fix warning when XOR_SELECT_TEMPLATE is unset
From: Herbert Xu @ 2016-08-26 15:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Martin Schwidefsky, linux-next, linux-kernel,
Linux Crypto Mailing List
In-Reply-To: <20160825211411.08858397@canb.auug.org.au>
On Thu, Aug 25, 2016 at 09:14:11PM +1000, Stephen Rothwell wrote:
>
> That looks fine to me. An alternative might be to have:
>
> #ifndef XOR_SELECT_TEMPLATE
> #define XOR_SELECT_TEMPLATE(x) (x)
> #endif
>
> near the top of the file. That gets the #ifdef out of the code flow
> and serves as some hint that such a thing can be defined by arch header
> files.
Good idea. Thanks Stephen.
---8<---
This patch fixes an unused label warning triggered when the macro
XOR_SELECT_TEMPLATE is not set.
Fixes: 39457acda913 ("crypto: xor - skip speed test if the xor...")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Suggested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/crypto/xor.c b/crypto/xor.c
index b8975d9..263af9f 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -24,6 +24,10 @@
#include <linux/preempt.h>
#include <asm/xor.h>
+#ifndef XOR_SELECT_TEMPLATE
+#define XOR_SELECT_TEMPLATE(x) (x)
+#endif
+
/* The xor routines to use. */
static struct xor_block_template *active_template;
@@ -109,17 +113,14 @@ calibrate_xor_blocks(void)
void *b1, *b2;
struct xor_block_template *f, *fastest;
- fastest = NULL;
+ fastest = XOR_SELECT_TEMPLATE(NULL);
-#ifdef XOR_SELECT_TEMPLATE
- fastest = XOR_SELECT_TEMPLATE(fastest);
if (fastest) {
printk(KERN_INFO "xor: automatically using best "
"checksumming function %-10s\n",
fastest->name);
goto out;
}
-#endif
/*
* Note: Since the memory is not actually used for _anything_ but to
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related
* Re: linux-next: build warnings after merge of the kbuild tree
From: Nicholas Mc Guire @ 2016-08-26 6:21 UTC (permalink / raw)
To: Nicholas Piggin
Cc: Michal Marek, Stephen Rothwell, linux-next, PowerPC, linux-kernel,
Al Viro, linux-kbuild
In-Reply-To: <20160826135803.0c5ffb42@roar.ozlabs.ibm.com>
On Fri, Aug 26, 2016 at 01:58:03PM +1000, Nicholas Piggin wrote:
> On Mon, 22 Aug 2016 20:47:58 +1000
> Nicholas Piggin <npiggin@gmail.com> wrote:
>
> > On Fri, 19 Aug 2016 20:44:55 +1000
> > Nicholas Piggin <npiggin@gmail.com> wrote:
> >
> > > On Fri, 19 Aug 2016 10:37:00 +0200
> > > Michal Marek <mmarek@suse.cz> wrote:
> > >
> > > > On 2016-08-19 07:09, Stephen Rothwell wrote:
> >
> > [snip]
> >
> > > > >
> > > > > I may be missing something, but genksyms generates the crc's off the
> > > > > preprocessed C source code and we don't have any for the asm files ...
> > > >
> > > > Of course you are right. Which means that we are losing type information
> > > > for these exports for CONFIG_MODVERSIONS purposes. I guess it's
> > > > acceptable, since the asm functions are pretty basic and their
> > > > signatures do not change.
> > >
> > > I don't completely agree. It would be nice to have the functionality
> > > still there.
> > >
> > > What happens if you just run cmd_modversions on the as rule? It relies on
> > > !defined(__ASSEMBLY__), but we're feeding the result to genksyms, not as.
> > > It would require the header be included in the .S file and be protected for
> > > asm builds.
> >
> >
> > This seems like it *could* be made to work, but there's a few problems.
> >
> > - .h files are not made for C consumption. Matter of manually adding the
> > ifdef guards, which isn't terrible.
> >
> > - .S files do not all include their .h where the C declaration is. Also
> > will cause some churn but doable and maybe not completely unreasonable.
> >
> > - genksyms parser barfs when it hits the assembly of the .S file. Best
> > way to fix that seems just send the #include and EXPORT_SYMBOL lines
> > from the .S to the preprocessor. That's a bit of a rabbit hole too, with
> > some .S files being included, etc.
> >
> > I'm not sure what to do here. If nobody cares and we lose CRCs for .S
> > exports, then okay we can whitelist those relocs easily. If we don't want
> > to lose the functionality, the above might work but it's a bit intrusive
> > an is going to require another cycle of prep patches to go through arch
> > code first.
> >
> > Or suggestions for alternative approach?
>
> Here is a quick patch that I think should catch missing CRCs in
> architecture independent way. If we merge something like this, we
> can whitelist the symbols in arch/powerpc so people get steered to
> the right place.
>
> Powerpc seems to be the only one really catching this, and it's
> only as a side effect of a test run for CONFIG_RELOCATABLE kernels,
> which means version failures probably slipped through other archs.
>
> I'll clean it up, do some more testing, and submit it unless
> anybody dislikes it or has a better way to do it.
>
> Thanks,
> Nick
>
>
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index 4b8ffd3..1efc454 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -609,6 +609,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
> {
> unsigned int crc;
> enum export export;
> + int is_crc = 0;
should that not be a bool here ?
>
> if ((!is_vmlinux(mod->name) || mod->is_dot_o) &&
> strncmp(symname, "__ksymtab", 9) == 0)
> @@ -618,6 +619,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
>
> /* CRC'd symbol */
> if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
> + is_crc = 1;
is_crc = true;
> crc = (unsigned int) sym->st_value;
> sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
> export);
thx!
hofrat
^ permalink raw reply
* Re: linux-next: build warnings after merge of the kbuild tree
From: Nicholas Piggin @ 2016-08-26 3:58 UTC (permalink / raw)
To: Michal Marek
Cc: Stephen Rothwell, linux-next, PowerPC, linux-kernel, Al Viro,
linux-kbuild
In-Reply-To: <20160822204758.5b2cff63@roar.ozlabs.ibm.com>
On Mon, 22 Aug 2016 20:47:58 +1000
Nicholas Piggin <npiggin@gmail.com> wrote:
> On Fri, 19 Aug 2016 20:44:55 +1000
> Nicholas Piggin <npiggin@gmail.com> wrote:
>
> > On Fri, 19 Aug 2016 10:37:00 +0200
> > Michal Marek <mmarek@suse.cz> wrote:
> >
> > > On 2016-08-19 07:09, Stephen Rothwell wrote:
>
> [snip]
>
> > > >
> > > > I may be missing something, but genksyms generates the crc's off the
> > > > preprocessed C source code and we don't have any for the asm files ...
> > >
> > > Of course you are right. Which means that we are losing type information
> > > for these exports for CONFIG_MODVERSIONS purposes. I guess it's
> > > acceptable, since the asm functions are pretty basic and their
> > > signatures do not change.
> >
> > I don't completely agree. It would be nice to have the functionality
> > still there.
> >
> > What happens if you just run cmd_modversions on the as rule? It relies on
> > !defined(__ASSEMBLY__), but we're feeding the result to genksyms, not as.
> > It would require the header be included in the .S file and be protected for
> > asm builds.
>
>
> This seems like it *could* be made to work, but there's a few problems.
>
> - .h files are not made for C consumption. Matter of manually adding the
> ifdef guards, which isn't terrible.
>
> - .S files do not all include their .h where the C declaration is. Also
> will cause some churn but doable and maybe not completely unreasonable.
>
> - genksyms parser barfs when it hits the assembly of the .S file. Best
> way to fix that seems just send the #include and EXPORT_SYMBOL lines
> from the .S to the preprocessor. That's a bit of a rabbit hole too, with
> some .S files being included, etc.
>
> I'm not sure what to do here. If nobody cares and we lose CRCs for .S
> exports, then okay we can whitelist those relocs easily. If we don't want
> to lose the functionality, the above might work but it's a bit intrusive
> an is going to require another cycle of prep patches to go through arch
> code first.
>
> Or suggestions for alternative approach?
Here is a quick patch that I think should catch missing CRCs in
architecture independent way. If we merge something like this, we
can whitelist the symbols in arch/powerpc so people get steered to
the right place.
Powerpc seems to be the only one really catching this, and it's
only as a side effect of a test run for CONFIG_RELOCATABLE kernels,
which means version failures probably slipped through other archs.
I'll clean it up, do some more testing, and submit it unless
anybody dislikes it or has a better way to do it.
Thanks,
Nick
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 4b8ffd3..1efc454 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -609,6 +609,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
{
unsigned int crc;
enum export export;
+ int is_crc = 0;
if ((!is_vmlinux(mod->name) || mod->is_dot_o) &&
strncmp(symname, "__ksymtab", 9) == 0)
@@ -618,6 +619,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
/* CRC'd symbol */
if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
+ is_crc = 1;
crc = (unsigned int) sym->st_value;
sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
export);
@@ -663,6 +665,10 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
else
symname++;
#endif
+ if (is_crc && !mod->is_dot_o) {
+ const char *e = is_vmlinux(mod->name) ?"":".ko";
+ warn("EXPORT symbol \"%s\" [%s%s] version generation failed, symbol will not be versioned.\n", symname + strlen(CRC_PFX), mod->name, e);
+ }
mod->unres = alloc_symbol(symname,
ELF_ST_BIND(sym->st_info) == STB_WEAK,
mod->unres);
^ permalink raw reply related
* mmotm 2016-08-25-15-19 uploaded
From: akpm @ 2016-08-25 22:20 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-08-25-15-19 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.8-rc3:
(patches marked "*" will be included in linux-next)
origin.patch
* byteswap-dont-use-__builtin_bswap-with-sparse.patch
* get_maintainer-quiet-noisy-implicit-f-vcs_file_exists-checking.patch
* sysctl-handle-error-writing-uint_max-to-u32-fields.patch
* stackdepot-fix-mempolicy-use-after-free.patch
* soft_dirty-fix-soft_dirty-during-thp-split.patch
* printk-fix-parsing-of-brl=-option.patch
* treewide-replace-config_enabled-with-is_enabled-2nd-round.patch
* mm-clarify-compaction-kconfig-text.patch
* mm-memcontrol-avoid-unused-function-warning.patch
* fs-seq_file-fix-out-of-bounds-read.patch
* dax-fix-device-dax-region-base.patch
* mm-silently-skip-readahead-for-dax-inodes.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
* mm-oom-prevent-pre-mature-oom-killer-invocation-for-high-order-request.patch
* mm-page_alloc-replace-set_dma_reserve-to-set_memory_reserve.patch
* fadump-register-the-memory-reserved-by-fadump.patch
* mm-slab-improve-performance-of-gathering-slabinfo-stats.patch
* kthread-rename-probe_kthread_data-to-kthread_probe_data.patch
* kthread-kthread-worker-api-cleanup.patch
* kthread-smpboot-do-not-park-in-kthread_create_on_cpu.patch
* kthread-allow-to-call-__kthread_create_on_node-with-va_list-args.patch
* kthread-add-kthread_create_worker.patch
* kthread-add-kthread_destroy_worker.patch
* kthread-detect-when-a-kthread-work-is-used-by-more-workers.patch
* kthread-initial-support-for-delayed-kthread-work.patch
* kthread-allow-to-cancel-kthread-work.patch
* kthread-allow-to-modify-delayed-kthread-work.patch
* kthread-better-support-freezable-kthread-workers.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* kbuild-simpler-generation-of-assembly-constants.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
mm.patch
* mm-oom-deduplicate-victim-selection-code-for-memcg-and-global-oom.patch
* mm-zsmalloc-add-trace-events-for-zs_compact.patch
* mm-zsmalloc-add-per-class-compact-trace-event.patch
* mm-vmalloc-fix-align-value-calculation-error.patch
* mm-vmalloc-fix-align-value-calculation-error-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix.patch
* mm-memcontrol-add-sanity-checks-for-memcg-idref-on-get-put.patch
* mm-oom_killc-fix-task_will_free_mem-comment.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
* mm-compaction-cleanup-unused-functions.patch
* mm-compaction-rename-compact_partial-to-compact_success.patch
* mm-compaction-dont-recheck-watermarks-after-compact_success.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority-fix.patch
* mm-compaction-use-correct-watermark-when-checking-compaction-success.patch
* mm-compaction-create-compact_gap-wrapper.patch
* mm-compaction-create-compact_gap-wrapper-fix.patch
* mm-compaction-use-proper-alloc_flags-in-__compaction_suitable.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders-fix.patch
* mm-vmscan-make-compaction_ready-more-accurate-and-readable.patch
* mem-hotplug-fix-node-spanned-pages-when-we-have-a-movable-node.patch
* mm-fix-set-pageblock-migratetype-in-deferred-struct-page-init.patch
* mm-vmscan-get-rid-of-throttle_vm_writeout.patch
* mm-debug_pagealloc-clean-up-guard-page-handling-code.patch
* mm-debug_pagealloc-dont-allocate-page_ext-if-we-dont-use-guard-page.patch
* mm-page_owner-move-page_owner-specific-function-to-page_ownerc.patch
* mm-page_ext-rename-offset-to-index.patch
* mm-page_ext-support-extra-space-allocation-by-page_ext-user.patch
* mm-page_owner-dont-define-fields-on-struct-page_ext-by-hard-coding.patch
* do_generic_file_read-fail-immediately-if-killed.patch
* mm-pagewalk-fix-the-comment-for-test_walk.patch
* mm-unrig-vma-cache-hit-ratio.patch
* mm-swap-add-swap_cluster_list.patch
* mm-swap-add-swap_cluster_list-checkpatch-fixes.patch
* mmoom_reaper-reduce-find_lock_task_mm-usage.patch
* mmoom_reaper-do-not-attempt-to-reap-a-task-twice.patch
* oom-keep-mm-of-the-killed-task-available.patch
* kernel-oom-fix-potential-pgd_lock-deadlock-from-__mmdrop.patch
* mm-oom-get-rid-of-signal_struct-oom_victims.patch
* oom-suspend-fix-oom_killer_disable-vs-pm-suspend-properly.patch
* mm-oom-enforce-exit_oom_victim-on-current-task.patch
* mm-make-sure-that-kthreads-will-not-refault-oom-reaped-memory.patch
* oom-oom_reaper-allow-to-reap-mm-shared-by-the-kthreads.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* proc-much-faster-proc-vmstat.patch
* proc-faster-proc-status.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
* meminfo-break-apart-a-very-long-seq_printf-with-ifdefs.patch
* proc-relax-proc-tid-timerslack_ns-capability-requirements.patch
* proc-add-lsm-hook-checks-to-proc-tid-timerslack_ns.patch
* min-max-remove-sparse-warnings-when-theyre-nested.patch
* cred-simpler-1d-supplementary-groups.patch
* console-dont-prefer-first-registered-if-dt-specifies-stdout-path.patch
* radix-tree-slot-can-be-null-in-radix_tree_next_slot.patch
* radix-tree-tests-add-iteration-test.patch
* radix-tree-tests-properly-initialize-mutex.patch
* lib-add-crc64-ecma-module.patch
* compat-remove-compat_printk.patch
* checkpatch-see-if-modified-files-are-marked-obsolete-in-maintainers.patch
* checkpatch-look-for-symbolic-permissions-and-suggest-octal-instead.patch
* autofs-fix-typos-in-documentation-filesystems-autofs4txt.patch
* autofs-drop-unnecessary-extern-in-autofs_ih.patch
* autofs-test-autofs-versions-first-on-sb-initialization.patch
* autofs-fix-autofs4_fill_super-error-exit-handling.patch
* autofs-add-warn_on1-for-non-dir-link-inode-case.patch
* autofs-remove-ino-free-in-autofs4_dir_symlink.patch
* autofs-use-autofs4_free_ino-to-kfree-dentry-data.patch
* autofs-remove-obsolete-sb-fields.patch
* autofs-dont-fail-to-free_dev_ioctlparam.patch
* autofs-remove-autofs_devid_len.patch
* autofs-fix-documentation-regarding-devid-on-ioctl.patch
* autofs-update-struct-autofs_dev_ioctl-in-documentation.patch
* autofs-fix-pr_debug-message.patch
* autofs-fix-dev-ioctl-number-range-check.patch
* autofs-add-autofs_dev_ioctl_version-for-autofs_dev_ioctl_version_cmd.patch
* autofs-fix-print-format-for-ioctl-warning-message.patch
* autofs-move-inclusion-of-linux-limitsh-to-uapi.patch
* autofs4-move-linux-auto_dev-ioctlh-to-uapi-linux.patch
* kexec_file-allow-arch-specific-memory-walking-for-kexec_add_buffer.patch
* kexec_file-change-kexec_add_buffer-to-take-kexec_buf-as-argument.patch
* kexec_file-factor-out-kexec_locate_mem_hole-from-kexec_add_buffer.patch
* powerpc-factor-out-relocation-code-from-module_64c-to-elf_util_64c.patch
* powerpc-factor-out-relocation-code-from-module_64c-to-elf_util_64c-checkpatch-fixes.patch
* powerpc-generalize-elf64_apply_relocate_add.patch
* powerpc-adapt-elf64_apply_relocate_add-for-kexec_file_load.patch
* powerpc-adapt-elf64_apply_relocate_add-for-kexec_file_load-checkpatch-fixes.patch
* powerpc-add-functions-to-read-elf-files-of-any-endianness.patch
* powerpc-implement-kexec_file_load.patch
* powerpc-add-code-to-work-with-device-trees-in-kexec_file_load.patch
* powerpc-add-code-to-work-with-device-trees-in-kexec_file_load-checkpatch-fixes.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation.patch
* powerpc-enable-config_kexec_file-in-powerpc-server-defconfigs.patch
* kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* powerpc-kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* kexec_file-allow-skipping-checksum-calculation-for-some-segments.patch
* kexec_file-add-mechanism-to-update-kexec-segments.patch
* ima-demonstration-code-for-kexec-buffer-passing.patch
* ima-demonstration-code-for-kexec-buffer-passing-checkpatch-fixes.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-rio_cm-use-memdup_user-instead-of-duplicating-code.patch
* random-simplify-api-for-random-address-requests.patch
* x86-use-simpler-api-for-random-address-requests.patch
* arm-use-simpler-api-for-random-address-requests.patch
* arm64-use-simpler-api-for-random-address-requests.patch
* tile-use-simpler-api-for-random-address-requests.patch
* unicore32-use-simpler-api-for-random-address-requests.patch
* random-remove-unused-randomize_range.patch
* dma-mapping-introduce-the-dma_attr_no_warn-attribute.patch
* powerpc-implement-the-dma_attr_no_warn-attribute.patch
* nvme-use-the-dma_attr_no_warn-attribute.patch
* x86-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* mips-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* relay-use-per-cpu-constructs-for-the-relay-channel-buffer-pointers.patch
* config-android-remove-config_ipv6_privacy.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msg-implement-lockless-pipelined-wakeups.patch
* ipc-msg-batch-queue-sender-wakeups.patch
* ipc-msg-make-ss_wakeup-kill-arg-boolean.patch
* ipc-msg-lockless-security-checks-for-msgsnd.patch
* ipc-msg-avoid-waking-sender-upon-full-queue.patch
* ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
linux-next.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* include-linux-mlx5-deviceh-kill-build_bug_ons.patch
* kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* mm-kmemleak-avoid-using-__va-on-addresses-that-dont-have-a-lowmem-mapping.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: linux-next: build warning after merge of the crypto tree
From: Stephen Rothwell @ 2016-08-25 11:14 UTC (permalink / raw)
To: Herbert Xu; +Cc: Martin Schwidefsky, linux-next, linux-kernel
In-Reply-To: <20160825074701.GA11175@gondor.apana.org.au>
Hi Herbert,
On Thu, 25 Aug 2016 15:47:01 +0800 Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> I'm going to do something like this:
>
> ---8<---
> This patch fixes an unused label warning triggered when the macro
> XOR_SELECT_TEMPLATE is not set.
>
> Fixes: 39457acda913 ("crypto: xor - skip speed test if the xor...")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>
> diff --git a/crypto/xor.c b/crypto/xor.c
> index b8975d9..69866e9 100644
> --- a/crypto/xor.c
> +++ b/crypto/xor.c
> @@ -113,13 +113,14 @@ calibrate_xor_blocks(void)
>
> #ifdef XOR_SELECT_TEMPLATE
> fastest = XOR_SELECT_TEMPLATE(fastest);
> +#endif
> +
> if (fastest) {
> printk(KERN_INFO "xor: automatically using best "
> "checksumming function %-10s\n",
> fastest->name);
> goto out;
> }
> -#endif
That looks fine to me. An alternative might be to have:
#ifndef XOR_SELECT_TEMPLATE
#define XOR_SELECT_TEMPLATE(x) (x)
#endif
near the top of the file. That gets the #ifdef out of the code flow
and serves as some hint that such a thing can be defined by arch header
files.
Either way.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* next-20160825 build: 0 failures 4 warnings (next-20160825)
From: Build bot for Mark Brown @ 2016-08-25 8:18 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160825
Git describe: next-20160825
Commit: 0f98f121e1 Add linux-next specific files for 20160825
Build Time: 93 min 1 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 4
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
4 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 4
3 ../crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
2 ../drivers/video/fbdev/mb862xx/mb862xx-i2c.c:160:6: warning: unused variable 'ret' [-Wunused-variable]
1 ../drivers/net/ethernet/qlogic/qede/qede_ethtool.c:63:5: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/net/ethernet/qlogic/qede/qede_ethtool.c:63:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
../drivers/video/fbdev/mb862xx/mb862xx-i2c.c:160:6: warning: unused variable 'ret' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
../drivers/video/fbdev/mb862xx/mb862xx-i2c.c:160:6: warning: unused variable 'ret' [-Wunused-variable]
../drivers/net/ethernet/qlogic/qede/qede_ethtool.c:63:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/net/ethernet/qlogic/qede/qede_ethtool.c:63:5: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
^ permalink raw reply
* Re: linux-next: build warning after merge of the crypto tree
From: Herbert Xu @ 2016-08-25 7:47 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20160825082010.5523ae6f@mschwide>
On Thu, Aug 25, 2016 at 08:20:10AM +0200, Martin Schwidefsky wrote:
> On Thu, 25 Aug 2016 11:38:24 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Herbert,
> >
> > After merging the crypto tree, today's linux-next build (powerpc
> > ppc64_defconfig) produced this warning:
> >
> > crypto/xor.c: In function 'calibrate_xor_blocks':
> > crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
> > out:
> > ^
> >
> > Introduced by commit
> >
> > 39457acda913 ("crypto: xor - skip speed test if the xor function is selected automatically")
> >
> > This build does not have XOR_SELECT_TEMPLATE set.
>
> Hmm, this is probably the best option to get rid of the warning:
I'm going to do something like this:
---8<---
This patch fixes an unused label warning triggered when the macro
XOR_SELECT_TEMPLATE is not set.
Fixes: 39457acda913 ("crypto: xor - skip speed test if the xor...")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/crypto/xor.c b/crypto/xor.c
index b8975d9..69866e9 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -113,13 +113,14 @@ calibrate_xor_blocks(void)
#ifdef XOR_SELECT_TEMPLATE
fastest = XOR_SELECT_TEMPLATE(fastest);
+#endif
+
if (fastest) {
printk(KERN_INFO "xor: automatically using best "
"checksumming function %-10s\n",
fastest->name);
goto out;
}
-#endif
/*
* Note: Since the memory is not actually used for _anything_ but to
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related
* Re: linux-next: build warning after merge of the crypto tree
From: Martin Schwidefsky @ 2016-08-25 6:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Herbert Xu, linux-next, linux-kernel
In-Reply-To: <20160825113824.61ca7364@canb.auug.org.au>
On Thu, 25 Aug 2016 11:38:24 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Herbert,
>
> After merging the crypto tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> crypto/xor.c: In function 'calibrate_xor_blocks':
> crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
> out:
> ^
>
> Introduced by commit
>
> 39457acda913 ("crypto: xor - skip speed test if the xor function is selected automatically")
>
> This build does not have XOR_SELECT_TEMPLATE set.
Hmm, this is probably the best option to get rid of the warning:
--
diff --git a/crypto/xor.c b/crypto/xor.c
index b8975d9..f00edfc 100644
--- a/crypto/xor.c
+++ b/crypto/xor.c
@@ -117,7 +117,8 @@ calibrate_xor_blocks(void)
printk(KERN_INFO "xor: automatically using best "
"checksumming function %-10s\n",
fastest->name);
- goto out;
+ active_template = fastest;
+ return 0;
}
#endif
@@ -153,7 +154,6 @@ calibrate_xor_blocks(void)
#undef xor_speed
free_pages((unsigned long)b1, 2);
-out:
active_template = fastest;
return 0;
}
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply related
* Re: linux-next: Tree for Aug 25
From: Stephen Rothwell @ 2016-08-25 5:02 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
In-Reply-To: <20160825145459.6b252d0a@canb.auug.org.au>
Hi all,
On Thu, 25 Aug 2016 14:54:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Changes since 20160824:
Just a reminder that I will not doing a linux-next release until
next-20160905 (i.e. Monday week my time).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Aug 25
From: Stephen Rothwell @ 2016-08-25 4:54 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160824:
The kbuild tree still had its build warnings for PowerPC, for which I
reverted a commit.
Non-merge commits (relative to Linus' tree): 3682
3689 files changed, 170524 insertions(+), 63738 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 240 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (4935e04ef431 Merge branch 'for-linus-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
Merging arc-current/for-curr (c57653dc94d0 ARC: export __udivdi3 for modules)
Merging arm-current/fixes (87eed3c74d7c ARM: fix address limit restoration for undefined instructions)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
Merging powerpc-fixes/fixes (ca49e64f0cb1 selftests/powerpc: Specify we expect to build with std=gnu99)
Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled)
Merging net/master (51af96b53469 mlxsw: router: Enable neighbors to be created on stacked devices)
Merging ipsec/master (11d7a0bb95ea xfrm: Only add l3mdev oif to dst lookups)
Merging netfilter/master (b75911b66ad5 netfilter: cttimeout: fix use after free error when delete netns)
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (b64abcb7dae6 brcmfmac: Change vif_event_lock to spinlock)
Merging mac80211/master (4d0bd46a4d55 Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel")
Merging sound-current/for-linus (abaa2274811d ALSA: hda/realtek - fix headset mic detection for MSI MS-B120)
Merging pci-current/for-linus (21c80c9fefc3 x86/PCI: VMD: Fix infinite loop executing irq's)
Merging driver-core.current/driver-core-linus (694d0d0bb203 Linux 4.8-rc2)
Merging tty.current/tty-linus (87a713c8ffca 8250/fintek: rename IRQ_MODE macro)
Merging usb.current/usb-linus (53e5f36fbd24 USB: avoid left shift by -1)
Merging usb-gadget-fixes/fixes (a0ad85ae866f usb: dwc3: gadget: stop processing on HWO set)
Merging usb-serial-fixes/usb-linus (40d9c32525cb USB: serial: option: add WeTelecom 0x6802 and 0x6803 products)
Merging usb-chipidea-fixes/ci-for-usb-stable (c4e94174983a usb: chipidea: udc: don't touch DP when controller is in host mode)
Merging staging.current/staging-linus (eafe5cfe7189 Merge tag 'iio-fixes-for-4.8a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-linus)
Merging char-misc.current/char-misc-linus (51c70261b257 Revert "android: binder: fix dangling pointer comparison")
Merging input-current/for-linus (e3a888a4bff0 Input: ads7846 - remove redundant regulator_disable call)
Merging crypto-current/master (901d3d4fee83 crypto: vmx - fix null dereference in p8_aes_xts_crypt)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (c9d2d3ac4ed0 drm/i915/dvo: Remove dangling call to drm_encoder_cleanup())
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (e6aeb2fbb85f ARC: Support syscall ABI v4)
Merging arm/for-next (d0a0f0bafaf4 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
Merging arm-soc/for-next (756c52412437 Merge branch 'fixes' into for-next)
Merging amlogic/for-next (57d06053f68b Merge v4.8/mmc)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (ab4e0d3745d6 Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (2c6bb730dd4e Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (38b7b9bdeb7a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (3853bd4d48a1 Merge branch 'omap-for-v4.9/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (54ba896ebf5e Merge branch 'arm64-defconfig-for-4.9' into all-for-4.8)
Merging renesas/next (903456504371 Merge branch 'soc-for-v4.9' into next)
Merging rockchip/for-next (80fd8abc3200 Merge branch 'v4.8-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (7a169f838a67 Merge branch 'next/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
Merging arm64/for-next/core (747a70e60b72 arm64: Fix copy-on-write referencing in HugeTLB)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging m68knommu/for-next (fa8410b35525 Linux 4.8-rc3)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (82440d0d030d Merge branch '4.8-fixes' into mips-for-linux-next)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (523d939ef98f Linux 4.7)
Merging powerpc/next (29b4817d4018 Linux 4.8-rc1)
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (2ccb5bf0e2f1 s390/tape: Use memdup_user() rather than duplicating its implementation)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (74050a3188c8 tile-srom: avoid krealloc(... __GFP_ZERO) pattern)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (79354fc60318 Btrfs: fix lockdep warning on deadlock against an inode's log mutex)
Merging ceph/master (0276dca6c1ec rbd: add force close option)
Merging cifs/for-next (8e1e83d23606 Move check for prefix path to within cifs_get_root())
Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (3cd0126dca82 quota: fill in Q_XGETQSTAT inode information for inactive quotas)
Merging ext4/dev (7bc949164511 ext4: verify extent header depth)
Merging f2fs/dev (cad9d20784e9 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (7244b9538994 f2fs: use filemap_check_errors())
Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules"
Merging gfs2/for-next (23e5671a79be gfs2: Fix extended attribute readahead optimization)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (41963c10c47a pnfs/blocklayout: update last_write_offset atomically with extents)
Merging nfsd/nfsd-next (e2ce4e03e317 nfsd: eliminate cb_minorversion field)
Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
Merging overlayfs/overlayfs-next (f200ea288c78 Revert "ovl: get_write_access() in truncate")
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
Merging xfs/for-next (32438cf9d54b Merge branch 'iomap-fixes-4.8-rc3' into for-next)
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting)
Merging vfs/for-next (3baf32898e1c parisc: use %pD)
Merging pci/next (29b4817d4018 Linux 4.8-rc1)
Merging pstore/for-next/pstore (e976e56423dc ramoops: use persistent_ram_free() instead of kfree() for freeing prz)
Merging hid/for-next (dc1de1f4bebd Merge branch 'for-4.8/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (00f0ea70d2b8 eeprom: at24: check if the chip is functional in probe())
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (0cf56b7b9c31 hwmon: (ucd9000) Add support for UCD90160 Power Supply Sequencer)
Merging v4l-dvb/master (b6aa39228966 Merge tag 'v4.8-rc1' into patchwork)
Merging pm/linux-next (ed8a91cce541 Merge branches 'acpi-sysfs', 'acpi-ec' and 'acpi-soc' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (33f27e0f4801 Merge branches 'for-rc' and 'release' into next)
Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next)
CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
CONFLICT (add/add): Merge conflict in drivers/thermal/qcom/tsens.c
CONFLICT (add/add): Merge conflict in drivers/thermal/qcom/tsens-common.c
Applying: thermal: fix up for "fix race condition when updating cooling device"
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (9b8b266033eb Merge branch 'topic/tegra' into next)
Merging net-next/master (6546c78ea671 Merge tag 'rxrpc-rewrite-20160824-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Merging ipsec-next/master (9d0380df6217 xfrm: policy: convert policy_lock to spinlock)
Merging netfilter-next/master (b43f95695124 netfilter: nf_tables: typo in trace attribute definition)
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (60747ef4d173 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging bluetooth/master (78abbac5a2ba Bluetooth: bcm203x: don't print error when allocating urb fails)
Merging mac80211-next/master (2d75da13fbb9 nl80211: Allow GET_INTERFACE dumps to be filtered)
Merging rdma/for-next (204f69ba6412 IB/hns: Fix return value check in hns_roce_get_cfg())
Merging rdma-leon/rdma-next (29b4817d4018 Linux 4.8-rc1)
Merging rdma-leon-test/testing/rdma-next (4dd75e30effb Merge branch 'topic/merge-branch' into testing/rdma-next)
Merging mtd/master (11e8a7f9aa94 Merge tag 'for-linus-20160801' into HEAD)
Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM)
Merging nand/nand/next (e5c88bb4ce0a mtd: nand_bbt: scan for next free bbt block if writing bbt fails)
Merging crypto/master (16d56963e832 crypto: rockchip - use devm_add_action_or_reset())
Merging drm/drm-next (0d42204f3743 drm/doc: Document uapi requirements in DRM)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Merging drm-panel/drm/panel/for-next (a42f6e3f8f03 drm/panel: simple: Add delay timing for Sharp LQ123P1JX31)
Merging drm-intel/for-linux-next (abc80abde5bd drm/i915: Force RC6 restore after system resume and reset)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
Merging drm-misc/topic/drm-misc (20353335099b drm/doc: Fix vga_switcheroo xref)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference())
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (d5a7764dc3e7 Merge branches 'sunxi/clk-for-4.9', 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/fixes-for-4.8' into sunxi/for-next)
Merging kbuild/for-next (dee81e988674 fixdep: faster CONFIG_ search)
Applying: Revert "ppc: move exports to definitions"
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (db420765b793 Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging sound/for-next (e15c282eff54 ALSA: bebob: unify configurations for some models produced by Yamaha/Terratec)
Merging sound-asoc/for-next (f739c978d6f3 Merge remote-tracking branch 'asoc/topic/topology' into asoc-next)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (99ff4d3af80c Input: jornada720_kbd - switch to using dev_dbg)
Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next)
Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next)
Merging device-mapper/for-next (9c5a559d9495 dm log: fix unitialized bio operation flags)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (5c4f4e441abb mmc: sunxi-mmc: change idma descriptor to __le32)
Merging md/for-next (fc8eb78e230a lib/raid6: Add AVX512 optimized xor_syndrome functions)
Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/master (1c4593edbd4a power: supply: Change Krzysztof Kozlowski's email to kernel.org)
Merging omap_dss2/for-next (e0299908d606 video: fbdev: pxafb: potential NULL dereference on error)
Merging regulator/for-next (53df648ee341 Merge remote-tracking branch 'regulator/topic/tps80031' into regulator-next)
Merging security/next (8ccc7d6bad84 seccomp: Remove 2-phase API documentation)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (348a0db9e69e selinux: drop SECURITY_SELINUX_POLICYDB_VERSION_MAX)
Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family))
Merging watchdog/master (29b4817d4018 Linux 4.8-rc1)
Merging iommu/next (35ee9598972e Merge branches 'iommu/fixes', 'x86/amd', 'arm/exynos' and 'arm/mediatek' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release)
Merging jc_docs/docs-next (8d8f60c5e0cd Merge branch 'doc/4.9' into docs-next)
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (523d939ef98f Linux 4.7)
Merging devicetree/for-next (34276bb062b8 of: fix reference counting in of_graph_get_endpoint_by_regs)
Merging mailbox/mailbox-for-next (a68b216676e8 mailbox: Fix format and type mismatches in Broadcom PDC driver)
Merging spi/for-next (f985fc19c155 Merge remote-tracking branches 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (2e461fd03f4b Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (6fa06b0d9e95 EDAC, mpc85xx: Fix PCIe error capture)
Merging irqchip/irqchip/for-next (e9abd777ebe8 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines)
Merging rcu/rcu/next (89d39c83d193 rcu: Tighted up __call_rcu() rcu_head alignment check)
Merging kvm/linux-next (694d0d0bb203 Linux 4.8-rc2)
Merging kvm-arm/next (29b4817d4018 Linux 4.8-rc1)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (93d17397e4e2 KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE)
Merging kvms390/next (1dbbcbf3f553 KVM: s390: lazy enable RI)
Merging xen-tip/linux-next (d34c30cc1fa8 xen: add static initialization of steal_clock op to xen_time_ops)
Merging percpu/for-next (a67823c1ed10 percpu-refcount: init ->confirm_switch member properly)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (29b4817d4018 Linux 4.8-rc1)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (1d1a77ddc8ac leds: centralize definition of "default-state" property)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (694d0d0bb203 Linux 4.8-rc2)
Merging tty/tty-next (694d0d0bb203 Linux 4.8-rc2)
Merging usb/usb-next (1aaaa9acaea1 Merge 4.8-rc3 into usb-next)
Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable())
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
Merging usb-chipidea-next/ci-for-usb-next (1d9aabecde29 usb: chipidea: udc: Use direction flags consequently)
Merging staging/staging-next (d5bd1eba1923 Merge tag 'iio-for-4.9a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-testing)
Merging char-misc/char-misc-next (4c73c0882b34 checkkconfigsymbols.py: add --no-color option, don't print color to non-TTY)
Merging extcon/extcon-next (160a746f5205 extcon: Use the extcon_set_state_sync() instead of deprecated functions)
Merging cgroup/for-next (667430ec48e4 Merge branch 'for-4.8-fixes' into for-next)
Merging scsi/for-next (dc43bf39f505 Merge branch 'misc' into for-next)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (6650248f46d7 Merge branch 'for-4.8-fixes' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging pinctrl/for-next (4bd0641c2d73 Merge branch 'devel' into for-next)
Merging vhost/linux-next (a77ec83a5789 vhost/scsi: fix reuse of &vq->iov[out] in response)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (f6ed80141833 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0926ebf30f55 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (53de7c26ded7 Merge branch 'for-4.8/regulator' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (a196d9ee289a Merge branch 'clk-fixes' into clk-next)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (29b4817d4018 Linux 4.8-rc1)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (5ad75fcdd712 Documentation: livepatch: add section about arch-specific code)
Merging coresight/next (67c52cac0c24 coresight: etm4x: adding configurable start/stop filtering)
Merging rtc/rtc-next (6c6aba9e8985 rtc: rx6110: remove owner assignment)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (d8d378fa1a0c tools/testing/nvdimm: fix SIGTERM vs hotplug crash)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (7a944a8456be ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
Applying: kdump, vmcoreinfo: report memory sections virtual addresses
Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
Merging akpm/master (152869a2980e mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping)
^ permalink raw reply
* linux-next: build warning after merge of the crypto tree
From: Stephen Rothwell @ 2016-08-25 1:38 UTC (permalink / raw)
To: Herbert Xu; +Cc: linux-next, linux-kernel, Martin Schwidefsky
Hi Herbert,
After merging the crypto tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
crypto/xor.c: In function 'calibrate_xor_blocks':
crypto/xor.c:156:1: warning: label 'out' defined but not used [-Wunused-label]
out:
^
Introduced by commit
39457acda913 ("crypto: xor - skip speed test if the xor function is selected automatically")
This build does not have XOR_SELECT_TEMPLATE set.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
From: Jani Nikula @ 2016-08-24 13:33 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: linux-next, linux-kernel
In-Reply-To: <20160824114206.17c98d9d@canb.auug.org.au>
On Wed, 24 Aug 2016, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/intel_display.c
>
> between commits from the drm-intel-fixes tree (some of which are
> cherry-picked from the drm-intel tree) and teh same and other commits
> from the drm-inte tree. These are just going to cause new conflicts
> every time you touch this file again in either tree (which happens a
> lot :-().
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider only putting
> the fix patches into the drm-intel-fixes tree and then getting them
> into the drm-intel tree by merging the -fixes tree instead of
> cherry-picking them the other way.
We used to do that, but switched to the current model instead. The main
reason was that we wanted our development branch to always get the fixes
first, without delay. We have several committers, and we want to make it
efficient and hassle free for them to get fixes applied.
The drm-intel tree is a fast moving target. If we fix something in
-fixes, there's no guarantee the fix applies to -next. It is more
important that we get the fix in -next, and all future kernels. If the
fix is important for current and stable kernels, we can do the
backport. This way, we can always resolve conflicts with the code in
-next, and be sure it contains all the fixes. If only -fixes had the
fixes, we'd have nightmare conflict resolutions trying to ensure none of
the fixes get dropped while merging.
Finally, you don't always know in advance whether the patch should be
applied to -next or -fixes. We'd end up with cherry-picks like this
anyway. Now we can do QA on the fixes in -next, and choose the ones to
backport.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox