* Re: linux-next: manual merge of the target-updates tree with the scsi tree
From: Stephen Rothwell @ 2017-06-28 5:46 UTC (permalink / raw)
To: Nicholas A. Bellinger, James Bottomley
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Quinn Tran,
Martin K. Petersen, Himanshu Madhani
In-Reply-To: <20170628154059.21dbfda2@canb.auug.org.au>
Hi all,
On Wed, 28 Jun 2017 15:40:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the target-updates tree got a conflict in:
>
> drivers/scsi/qla2xxx/qla_target.c
>
> between commits:
>
> f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit")
> 82de802ad46e ("scsi: qla2xxx: Preparation for Target MQ.")
>
> from the scsi tree and commit:
>
> 6b26726af699 ("qla2xxx: Convert QLA_TGT_ABTS to TARGET_SCF_LOOKUP_LUN_FROM_TAG")
>
> from the target-updates tree.
>
> I fixed it up (I think - see below) and can carry the fix as
OK, that was no right :-(
I have added the following fix patch as well (I suggest someone provide me with the correct fixup for tomorrow, please).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Jun 2017 15:44:27 +1000
Subject: [PATCH] qla2xxx: fix up for bad merge fix
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/scsi/qla2xxx/qla_target.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 9a054439560d..42a3f5be818c 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1875,7 +1875,6 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
{
struct qla_hw_data *ha = vha->hw;
struct qla_tgt_mgmt_cmd *mcmd;
- struct qla_tgt_cmd *cmd;
int rc;
if (abort_cmd_for_tag(vha, abts->exchange_addr_to_abort)) {
@@ -1898,14 +1897,13 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
}
memset(mcmd, 0, sizeof(*mcmd));
- cmd = container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
mcmd->sess = sess;
memcpy(&mcmd->orig_iocb.abts, abts, sizeof(mcmd->orig_iocb.abts));
mcmd->reset_count = ha->base_qpair->chip_reset;
mcmd->tmr_func = QLA_TGT_ABTS;
mcmd->qpair = ha->base_qpair;
- rc = ha->tgt.tgt_ops->handle_tmr(mcmd, cmd->unpacked_lun, mcmd->tmr_func,
+ rc = ha->tgt.tgt_ops->handle_tmr(mcmd, 0, mcmd->tmr_func,
abts->exchange_addr_to_abort);
if (rc != 0) {
ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052,
--
2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: linux-next: build failure after merge of the kspp tree
From: James Morris @ 2017-06-28 5:48 UTC (permalink / raw)
To: Kees Cook
Cc: John Johansen, Stephen Rothwell, Linux-Next Mailing List,
Linux Kernel Mailing List
In-Reply-To: <CAGXu5jLW9Hnng=bS11g98sXUiEk7fE6mizemD_au974hb-qJVQ@mail.gmail.com>
On Tue, 27 Jun 2017, Kees Cook wrote:
> On Mon, Jun 26, 2017 at 8:33 PM, James Morris <jmorris@namei.org> wrote:
> > On Mon, 26 Jun 2017, Kees Cook wrote:
> >
> >> >> Fixes: 8014370f1257 ("apparmor: move path_link mediation to using labels")
> >> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > Acked-by: John Johansen <john.johansen@canonical.com>
> >>
> >> Hi James,
> >>
> >> Just a ping; this needs to get into -next to avoid build errors.
> >
> > Surely Linus will resolve this when he pulls the trees in?
>
> It's not a merge glitch, it's a refactoring glitch. John's commit in
> security-next ("apparmor: move path_link mediation to using labels")
> undid an earlier commit 8486adf0d755 ("apparmor: use designated
> initializers") from v4.11. This patch is needed for security-next.
>
Thanks.
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* linux-next: build warning after merge of the libata tree
From: Stephen Rothwell @ 2017-06-28 5:51 UTC (permalink / raw)
To: Tejun Heo
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Minwoo Im,
Bart Van Assche
Hi Tejun,
After merging the libata tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:
drivers/ata/libata-scsi.c: In function 'ata_scsi_var_len_cdb_xlat':
drivers/ata/libata-scsi.c:4194:1: warning: label 'unspprt_sa' defined but not used [-Wunused-label]
unspprt_sa:
^
Introduced by commit
b1ffbf854e08 ("libata: Support for an ATA PASS-THROUGH(32) command.")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warnings after merge of the scsi-mkp tree
From: Stephen Rothwell @ 2017-06-28 5:55 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Darren Trapp,
Duane Grigsby, Anil Gurumurthy, Giridhar Malavali,
Himanshu Madhani, Hannes Reinecke
Hi Martin,
After merging the scsi-mkp tree, today's linux-next build
(powerpc_ppc64_defconfig) produced these warnings:
In file included from include/linux/byteorder/big_endian.h:4:0,
from arch/powerpc/include/uapi/asm/byteorder.h:13,
from include/asm-generic/bitops/le.h:5,
from arch/powerpc/include/asm/bitops.h:246,
from include/linux/bitops.h:36,
from include/linux/kernel.h:10,
from include/asm-generic/bug.h:15,
from arch/powerpc/include/asm/bug.h:127,
from include/linux/bug.h:4,
from arch/powerpc/include/asm/mmu.h:125,
from arch/powerpc/include/asm/lppaca.h:36,
from arch/powerpc/include/asm/paca.h:21,
from arch/powerpc/include/asm/current.h:16,
from include/linux/sched.h:11,
from include/linux/blkdev.h:4,
from include/linux/blk-mq.h:4,
from drivers/scsi/qla2xxx/qla_nvme.h:10,
from drivers/scsi/qla2xxx/qla_nvme.c:7:
drivers/scsi/qla2xxx/qla_nvme.c: In function 'qla2x00_start_nvme_mq':
include/uapi/linux/byteorder/big_endian.h:32:26: warning: large integer implicitly truncated to unsigned type [-Woverflow]
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
include/linux/byteorder/generic.h:87:21: note: in expansion of macro '__cpu_to_le32'
#define cpu_to_le32 __cpu_to_le32
^
drivers/scsi/qla2xxx/qla_nvme.c:444:27: note: in expansion of macro 'cpu_to_le32'
cont_pkt->entry_type = cpu_to_le32(CONTINUE_A64_TYPE);
^
drivers/scsi/qla2xxx/qla_nvme.c: At top level:
drivers/scsi/qla2xxx/qla_nvme.c:667:13: warning: 'qla_nvme_unregister_remote_port' defined but not used [-Wunused-function]
static void qla_nvme_unregister_remote_port(struct work_struct *work)
^
drivers/scsi/qla2xxx/qla_nvme.c:604:12: warning: 'qla_nvme_wait_on_rport_del' defined but not used [-Wunused-function]
static int qla_nvme_wait_on_rport_del(fc_port_t *fcport)
^
drivers/scsi/qla2xxx/qla_nvme.c:634:13: warning: 'qla_nvme_abort_all' defined but not used [-Wunused-function]
static void qla_nvme_abort_all(fc_port_t *fcport)
^
Introduced by commit
e84067d74301 ("scsi: qla2xxx: Add FC-NVMe F/W initialization and transport registration")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the kvms390 tree with the kvm-arm tree
From: Stephen Rothwell @ 2017-06-28 6:02 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck, Christoffer Dall,
Marc Zyngier
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Andrew Jones,
Claudio Imbrenda, Marcelo Tosatti, Gleb Natapov, KVM
In-Reply-To: <20170609142856.461a9d28@canb.auug.org.au>
Hi all,
On Fri, 9 Jun 2017 14:28:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> arch/s390/include/asm/kvm_host.h
>
> between commit:
>
> 2387149eade2 ("KVM: improve arch vcpu request defining")
>
> from the kvm-arm tree and commit:
>
> 8611a6a64661 ("KVM: s390: CMMA tracking, ESSA emulation, migration mode")
>
> from the kvms390 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/s390/include/asm/kvm_host.h
> index 9c3bd94204ac,a8cafed79eb4..000000000000
> --- a/arch/s390/include/asm/kvm_host.h
> +++ b/arch/s390/include/asm/kvm_host.h
> @@@ -42,9 -42,11 +42,11 @@@
> #define KVM_HALT_POLL_NS_DEFAULT 80000
>
> /* s390-specific vcpu->requests bit members */
> -#define KVM_REQ_ENABLE_IBS 8
> -#define KVM_REQ_DISABLE_IBS 9
> -#define KVM_REQ_ICPT_OPEREXC 10
> -#define KVM_REQ_START_MIGRATION 11
> -#define KVM_REQ_STOP_MIGRATION 12
> +#define KVM_REQ_ENABLE_IBS KVM_ARCH_REQ(0)
> +#define KVM_REQ_DISABLE_IBS KVM_ARCH_REQ(1)
> +#define KVM_REQ_ICPT_OPEREXC KVM_ARCH_REQ(2)
> ++#define KVM_REQ_START_MIGRATION KVM_ARCH_REQ(3)
> ++#define KVM_REQ_STOP_MIGRATION KVM_ARCH_REQ(4)
>
> #define SIGP_CTRL_C 0x80
> #define SIGP_CTRL_SCN_MASK 0x3f
With the merge window appraoching, I assume that these 2 trees will
merge in the kvm tree soon. This is just a reminder that this conflict
still exists (I think).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the random tree
From: Stephen Rothwell @ 2017-06-28 6:03 UTC (permalink / raw)
To: Andrew Morton, Theodore Ts'o
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Jason A. Donenfeld, Rik van Riel
In-Reply-To: <20170608162812.640fb3ab@canb.auug.org.au>
Hi Andrew,
[Yes, top posting :-)]
With the merge window approaching, just a reminder that this conflict
still exists.
On Thu, 8 Jun 2017 16:28:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/random.h
>
> between commit:
>
> 60473a13020f ("random: add get_random_{bytes,u32,u64,int,long,once}_wait family")
>
> from the random tree and commit:
>
> d7802aa82f66 ("random,stackprotect: introduce get_random_canary function")
>
> from the akpm-current 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/random.h
> index 4aecc339558d,1fa0dc880bd7..000000000000
> --- a/include/linux/random.h
> +++ b/include/linux/random.h
> @@@ -58,31 -57,27 +58,52 @@@ static inline unsigned long get_random_
> #endif
> }
>
> +/* Calls wait_for_random_bytes() and then calls get_random_bytes(buf, nbytes).
> + * Returns the result of the call to wait_for_random_bytes. */
> +static inline int get_random_bytes_wait(void *buf, int nbytes)
> +{
> + int ret = wait_for_random_bytes();
> + if (unlikely(ret))
> + return ret;
> + get_random_bytes(buf, nbytes);
> + return 0;
> +}
> +
> +#define declare_get_random_var_wait(var) \
> + static inline int get_random_ ## var ## _wait(var *out) { \
> + int ret = wait_for_random_bytes(); \
> + if (unlikely(ret)) \
> + return ret; \
> + *out = get_random_ ## var(); \
> + return 0; \
> + }
> +declare_get_random_var_wait(u32)
> +declare_get_random_var_wait(u64)
> +declare_get_random_var_wait(int)
> +declare_get_random_var_wait(long)
> +#undef declare_get_random_var
> +
> + /*
> + * On 64-bit architectures, protect against non-terminated C string overflows
> + * by zeroing out the first byte of the canary; this leaves 56 bits of entropy.
> + */
> + #ifdef CONFIG_64BIT
> + # ifdef __LITTLE_ENDIAN
> + # define CANARY_MASK 0xffffffffffffff00UL
> + # else /* big endian, 64 bits: */
> + # define CANARY_MASK 0x00ffffffffffffffUL
> + # endif
> + #else /* 32 bits: */
> + # define CANARY_MASK 0xffffffffUL
> + #endif
> +
> + static inline unsigned long get_random_canary(void)
> + {
> + unsigned long val = get_random_long();
> +
> + return val & CANARY_MASK;
> + }
> +
> unsigned long randomize_page(unsigned long start, unsigned long range);
>
> u32 prandom_u32(void);
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver)
From: Stephen Rothwell @ 2017-06-28 6:07 UTC (permalink / raw)
To: Yury Norov, Sumit Semwal, David S. Miller, Olof Johansson,
Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, LABBE Corentin, Maxime Ripard,
Chen-Yu Tsai, Linux-Next Mailing List
In-Reply-To: <20170610092944.4022d550@canb.auug.org.au>
Hi all,
[Yes, top posted :-)]
With the merge window approaching, this is just a reminder that this
merge problem still exists. I assume that the sunxi tree will be
merged into the arm-soc tree before going to Linus.
On Sat, 10 Jun 2017 09:29:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 9 Jun 2017 15:43:25 +0300 Yury Norov <ynorov@caviumnetworks.com> wrote:
> >
> > Today's linux-next breaks build with:
> > DTC arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb
> > arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb: ERROR (duplicate_node_names): Duplicate node name /soc/ethernet@1c30000
> > ERROR: Input tree has errors, aborting (use -f to force output)
> > scripts/Makefile.lib:325: recipe for target 'arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb' failed
> > make[2]: *** [arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb] Error 2
> > scripts/Makefile.build:561: recipe for target 'arch/arm64/boot/dts/allwinner' failed
> > make[1]: *** [arch/arm64/boot/dts/allwinner] Error 2 arch/arm64/Makefile:130: recipe for target 'dtbs' failed
> > make: *** [dtbs] Error 2
> >
> > It seems, it's due to duplication error in merge-commit 9afca2c4e379.
> > Removing it fixes the build.
>
> Thanks for the reports Yury and Sumit. I will apply the following
> merge fixup patch when I next build linux-next (unless one of the
> patches is removed in the mean time).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sat, 10 Jun 2017 09:18:14 +1000
> Subject: [PATCH] remove duplicate ethernet noce intruduced by merge
>
> caused by patch "arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet
> driver" being merged into the sunxi and net-next trees as different
> commits (e53f67e981bc and 103aefa01c1b respectively). Presumably the
> former will turn up in the arm-soc tree before being sent to Linus.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 --------------------
> 1 file changed, 20 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
> index 1b36aab5afb6..9d00622ce845 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
> @@ -469,26 +469,6 @@
> };
> };
>
> - emac: ethernet@1c30000 {
> - compatible = "allwinner,sun50i-a64-emac";
> - syscon = <&syscon>;
> - reg = <0x01c30000 0x100>;
> - interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
> - interrupt-names = "macirq";
> - resets = <&ccu RST_BUS_EMAC>;
> - reset-names = "stmmaceth";
> - clocks = <&ccu CLK_BUS_EMAC>;
> - clock-names = "stmmaceth";
> - status = "disabled";
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - mdio: mdio {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - };
> - };
> -
> gic: interrupt-controller@1c81000 {
> compatible = "arm,gic-400";
> reg = <0x01c81000 0x1000>,
> --
> 2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the kspp tree with the block tree
From: Stephen Rothwell @ 2017-06-28 6:13 UTC (permalink / raw)
To: Kees Cook, Jens Axboe; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
include/linux/fs.h
between commit:
c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
from the block tree and commit:
3abc2b3fcf5c ("randstruct: Mark various structs for randomization")
from the kspp 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/fs.h
index 0ddaac8f66d9,8f28143486c4..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -293,8 -275,7 +293,8 @@@ struct kiocb
void (*ki_complete)(struct kiocb *iocb, long ret, long ret2);
void *private;
int ki_flags;
+ enum rw_hint ki_hint;
- };
+ } __randomize_layout;
static inline bool is_sync_kiocb(struct kiocb *kiocb)
{
@@@ -401,8 -392,7 +401,8 @@@ struct address_space
gfp_t gfp_mask; /* implicit gfp mask for allocations */
struct list_head private_list; /* ditto */
void *private_data; /* ditto */
+ errseq_t wb_err;
- } __attribute__((aligned(sizeof(long))));
+ } __attribute__((aligned(sizeof(long)))) __randomize_layout;
/*
* On most architectures that alignment is already the case; but
* must be enforced here for CRIS, to let the least significant bit
@@@ -881,8 -868,8 +881,9 @@@ struct file
struct list_head f_tfile_llink;
#endif /* #ifdef CONFIG_EPOLL */
struct address_space *f_mapping;
+ errseq_t f_md_wb_err; /* metadata wb error tracking */
- } __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
+ } __randomize_layout
+ __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
struct file_handle {
__u32 handle_bytes;
^ permalink raw reply
* Re: linux-next: manual merge of the kvms390 tree with the kvm-arm tree
From: Christian Borntraeger @ 2017-06-28 7:10 UTC (permalink / raw)
To: Stephen Rothwell, Cornelia Huck, Christoffer Dall, Marc Zyngier
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Andrew Jones,
Claudio Imbrenda, Marcelo Tosatti, Gleb Natapov, KVM
In-Reply-To: <20170628160204.0007fe06@canb.auug.org.au>
On 06/28/2017 08:02 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Fri, 9 Jun 2017 14:28:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the kvms390 tree got a conflict in:
>>
>> arch/s390/include/asm/kvm_host.h
>>
>> between commit:
>>
>> 2387149eade2 ("KVM: improve arch vcpu request defining")
>>
>> from the kvm-arm tree and commit:
>>
>> 8611a6a64661 ("KVM: s390: CMMA tracking, ESSA emulation, migration mode")
>>
>> from the kvms390 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/s390/include/asm/kvm_host.h
>> index 9c3bd94204ac,a8cafed79eb4..000000000000
>> --- a/arch/s390/include/asm/kvm_host.h
>> +++ b/arch/s390/include/asm/kvm_host.h
>> @@@ -42,9 -42,11 +42,11 @@@
>> #define KVM_HALT_POLL_NS_DEFAULT 80000
>>
>> /* s390-specific vcpu->requests bit members */
>> -#define KVM_REQ_ENABLE_IBS 8
>> -#define KVM_REQ_DISABLE_IBS 9
>> -#define KVM_REQ_ICPT_OPEREXC 10
>> -#define KVM_REQ_START_MIGRATION 11
>> -#define KVM_REQ_STOP_MIGRATION 12
>> +#define KVM_REQ_ENABLE_IBS KVM_ARCH_REQ(0)
>> +#define KVM_REQ_DISABLE_IBS KVM_ARCH_REQ(1)
>> +#define KVM_REQ_ICPT_OPEREXC KVM_ARCH_REQ(2)
>> ++#define KVM_REQ_START_MIGRATION KVM_ARCH_REQ(3)
>> ++#define KVM_REQ_STOP_MIGRATION KVM_ARCH_REQ(4)
>>
>> #define SIGP_CTRL_C 0x80
>> #define SIGP_CTRL_SCN_MASK 0x3f
>
> With the merge window appraoching, I assume that these 2 trees will
> merge in the kvm tree soon. This is just a reminder that this conflict
> still exists (I think).
Yes, these 2 trees will be merged in the kvm tree and Paolo/Radim will resolve
the conflict.
^ permalink raw reply
* linux-next: build warning after merge of the tip tree
From: Stephen Rothwell @ 2017-06-28 7:15 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rik van Riel
Hi all,
After merging the tip tree, today's linux-next build (x86_64 allnoconfig)
produced this warning:
kernel/sched/fair.c:2657:9: warning: 'struct sched_domain' declared inside parameter list
int prev_cpu, int sync)
^
/home/sfr/next/next/kernel/sched/fair.c:2657:9: warning: its scope is only this definition or declaration, which is probably not what you want
Introduced by commit
3fed382b46ba ("sched/numa: Implement NUMA node level wake_affine()")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the block tree
From: Stephen Rothwell @ 2017-06-28 8:04 UTC (permalink / raw)
To: Jens Axboe
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Martin K. Petersen, Michael Ellerman, Benjamin Herrenschmidt,
PowerPC
Hi Jens,
After merging the block tree, today's linux-next build (powerpc
allnoconfig) failed like this:
fs/fcntl.o: In function `do_fcntl':
fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'
Probably caused by commit
c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
On powerpc (at least) you cannot use get_user() to fetch anything larger
than "unsigned long" i.e. 32 bits on 32 bit powerpc.
This has been discussed before (and, I think, a fix attempted).
For now I have applied the following patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Jun 2017 17:50:31 +1000
Subject: [PATCH] fs: don't read an enum directly from a u64 __user *
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/fcntl.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 24e233c75a33..19825eb7c40d 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -277,6 +277,7 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
{
struct inode *inode = file_inode(file);
u64 *argp = (u64 __user *)arg;
+ u64 h;
enum rw_hint hint;
switch (cmd) {
@@ -285,8 +286,9 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
return -EFAULT;
return 0;
case F_SET_FILE_RW_HINT:
- if (get_user(hint, argp))
+ if (copy_from_user(&h, argp, sizeof(h)))
return -EFAULT;
+ hint = (enum rw_hint)h;
if (!rw_hint_valid(hint))
return -EINVAL;
@@ -299,8 +301,9 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
return -EFAULT;
return 0;
case F_SET_RW_HINT:
- if (get_user(hint, argp))
+ if (copy_from_user(&h, argp, sizeof(h)))
return -EFAULT;
+ hint = (enum rw_hint)h;
if (!rw_hint_valid(hint))
return -EINVAL;
--
2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the akpm-current tree with the kselftest tree
From: Stephen Rothwell @ 2017-06-28 8:31 UTC (permalink / raw)
To: Andrew Morton, Shuah Khan
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Orson Zhai,
Luis R. Rodriguez
Hi all,
Today's linux-next merge of the akpm-current tree got conflicts in:
tools/testing/selftests/sysctl/common_tests
tools/testing/selftests/sysctl/run_numerictests
tools/testing/selftests/sysctl/run_stringtests
between commit:
d644437a1dc6 ("tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict")
from the kselftest tree and commit:
fed7038685f3 ("test_sysctl: add generic script to expand on tests")
from the akpm-current tree.
I fixed it up (I removed the files and so, for now I have effectively
dropped the kselftest tree patch) 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: Tree for Jun 28
From: Stephen Rothwell @ 2017-06-28 9:16 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Changes since 20170627:
I applied a supplied patch to the pci tree to fix a build problem.
The i2c tree lost its build failure.
The block tree gained a conflict against the file-locks tree. It also
gained a build failure on 32 bit powerpc for which I applied a patch.
The tip tree gained conflicts against the pci and blutooth trees.
The xen-tip tree gained a conflict against the tip tree.
The target-updates tree gained conflicts against the scsi tree.
The kspp tree gained a conflict against the block tree.
The akpm-current tree gained a conflict against the kselftest tree.
Non-merge commits (relative to Linus' tree): 9468
8884 files changed, 722147 insertions(+), 179596 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
and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And
finally, a simple boot test of the powerpc pseries_le_defconfig kernel
in qemu.
Below is a summary of the state of the merge.
I am currently merging 265 trees (counting Linus' and 41 trees of bug
fix patches pending for the current merge release).
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 (3c2bfbaadff6 Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig)
Merging arc-current/for-curr (45c7d002f207 ARC: defconfig: Cleanup from old Kconfig options)
Merging arm-current/fixes (d360a687d995 ARM: 8682/1: V7M: Set cacheid iff DminLine or IminLine is nonzero)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (d6bd8194e286 powerpc/32: Avoid miscompilation w/GCC 4.6.3 - don't inline copy_to/from_user())
Merging sparc/master (dbd2667a4fb9 sparc64: Fix gup_huge_pmd)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (e20bd60bf62a net: usb: asix88179_178a: Add support for the Belkin B2B128)
Merging ipsec/master (ca3a1b856636 esp6_offload: Fix IP6CB(skb)->nhoff for ESP GRO)
Merging netfilter/master (4b1f0d33db7d net: ipmr: Fix some mroute forwarding issues in vrf's)
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2())
Merging mac80211/master (4b153ca989a9 Merge tag 'mac80211-for-davem-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (c7ecb9068e67 ALSA: hda - Apply quirks to Broxton-T, too)
Merging pci-current/for-linus (98dbf5af4fdd PCI: endpoint: Select CRC32 to fix test build error)
Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2)
Merging tty.current/tty-linus (3c2993b8c614 Linux 4.12-rc4)
Merging usb.current/usb-linus (dec08194ffec xhci: Limit USB2 port wake support for AMD Promontory hosts)
Merging usb-gadget-fixes/fixes (f50b878fed33 USB: gadget: fix GPF in gadgetfs)
Merging usb-serial-fixes/usb-linus (996fab55d864 USB: serial: qcserial: new Sierra Wireless EM7305 device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer)
Merging staging.current/staging-linus (41f1830f5a7a Linux 4.12-rc6)
Merging char-misc.current/char-misc-linus (32c1431eea48 Linux 4.12-rc5)
Merging input-current/for-linus (9768935264c4 Input: synaptics-rmi4 - only read the F54 query registers which are used)
Merging crypto-current/master (019d62db5401 crypto: caam - fix gfp allocation flags (part II))
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-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 nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static)
Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1)
Merging mfd-fixes/for-mfd-fixes (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names)
Merging v4l-dvb-fixes/fixes (2a2599c66368 [media] media: entity: Catch unbalanced media_pipeline_stop calls)
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
Merging drm-intel-fixes/for-linux-next-fixes (611cdf3695a3 drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations)
Merging drm-misc-fixes/for-linux-next-fixes (e94ac3510b6a drm: Fix GETCONNECTOR regression)
Merging kbuild/for-next (39be5eac380d Merge branches 'misc', 'kbuild' and 'thin-ar' into for-next)
Merging uuid/for-next (b86a496a4206 ACPI: hns_dsaf_acpi_dsm_guid can be static)
Merging dma-mapping/for-next (dd64ef4fd3a2 ARM: dma-mapping: Remove traces of NOMMU code)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (db60a589614c ARC: set boot print log level to PR_INFO)
Merging arm/for-next (8288dded165c Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (c0f7f7acdecd perf: xgene: Add support for SoC PMU version 3)
Merging arm-soc/for-next (5d5cb55b2743 Merge branch 'next/arm64' into for-next)
Merging actions/for-next (8ba75fbb148a Merge branch 'v4.13/arm+sps' into next)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (f99503e956ae Merge branch 'v4.13/defconfig' into tmp/aml-rebuild)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (630efea351f0 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
CONFLICT (add/add): Merge conflict in arch/arm/mach-at91/samv7.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig
Merging bcm2835/for-next (652fb0c6435c Merge branch anholt/bcm2835-defconfig-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch '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 (bf6e15ed7f86 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next)
Merging mvebu/for-next (cf79eb3aab84 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (eb0028987143 Merge branch 'omap-for-v4.13/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (dfeac250c429 reset: zx2967: constify zx2967_reset_ops.)
Merging qcom/for-next (9c60544280d4 Merge tag 'qcom-drivers-for-4.13' into all-for-4.13-revised)
Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next)
Merging renesas/next (d75d45bfffd5 Merge branch 'fixes-for-v4.13' into next)
Merging rockchip/for-next (dd3f24b9ff88 Merge branch 'v4.13-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging samsung-krzk/for-next (005537e095a6 Merge branch 'fixes' into for-next)
Merging sunxi/sunxi/for-next (efb85d294c2a Merge branches 'sunxi/h3-for-4.13', 'sunxi/dt-for-4.13' and 'sunxi/dt64-for-4.13' into sunxi/for-next)
Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next)
Merging arm64/for-next/core (3edb1dd13ce6 Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core)
Merging clk/clk-next (682430e87734 clk: keystone: TI_SCI_PROTOCOL is needed for clk driver)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
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 (204a2be30a7a m68k: Remove ptrace_signal_deliver)
Merging m68knommu/for-next (354b6382847d m68k: defconfig: Cleanup from old Kconfig options)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception)
Merging mips/mips-for-linux-next (0554f2ed67f1 MIPS: Loogson: Make enum loongson_cpu_type more clear)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options)
Merging parisc-hd/for-next (d6b1d990957c parisc: use compat_sys_keyctl())
Merging powerpc/next (d4cfb11387ee powerpc: Convert VDSO update function to use new update_vsyscall interface)
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (f044f4c58898 s390/fpu: export save_fpu_regs for all configs)
Merging sparc-next/master (a718d1392700 sparc64: fix typo in property)
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (bdf3b55fde37 Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (4a240ddbe6b5 Merge branch 'for-next-current-v4.12-20170626' into for-next-20170626)
Merging ceph/master (4ca2fea6f827 ceph: unify inode i_ctime update)
Merging cifs/for-next (b3fdda4d1e1b cifs: Use smb 2 - 3 and cifsacl mount options getacl functions)
Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (08db141b5313 reiserfs: fix race in prealloc discard)
Merging ext4/dev (037ee4110538 ext4: require key for truncate(2) of encrypted file)
Merging f2fs/dev (01d42209996c f2fs: introduce reserved_blocks in sysfs)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (5acd48642842 PNFS fix dangling DS mount)
Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
Merging xfs/for-next (39775431f82f xfs: free uncommitted transactions during log recovery)
Merging file-locks/linux-next (df3bb902438d btrfs: minimal conversion to errseq_t writeback error reporting on fsync)
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (f4e981cba2de printk: add __printf attributes to internal functions)
Merging pci/next (44825fb1af1d Merge branch 'pci/host-xilinx' into next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_device.c
Applying: PCI: mediatek: change to use the new host bridge interface
Merging pstore/for-next/pstore (d3762358a739 pstore: Fix format string to use %u for record id)
Merging hid/for-next (0f9089b979a6 Merge branch 'for-4.13/wacom' into for-next)
Merging i2c/i2c/for-next (25c34d08744f Merge branch 'i2c/for-4.13' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (8efa050f19fe firmware: dmi_scan: Check DMI structure length)
Merging hwmon-staging/hwmon-next (44b413661b57 hwmon: (aspeed-pwm-tacho) Poll with short sleeps.)
Merging jc_docs/docs-next (52b3f239bb69 Docs: clean up some DocBook loose ends)
CONFLICT (modify/delete): scripts/kernel-doc-xml-ref deleted in jc_docs/docs-next and modified in HEAD. Version HEAD of scripts/kernel-doc-xml-ref left in tree.
$ git rm -f scripts/kernel-doc-xml-ref
Merging v4l-dvb/master (2748e76ddb29 media: staging: cxd2099: Activate cxd2099 buffer mode)
Merging v4l-dvb-next/master (d9c4615854ec [media] dvb uapi docs: enums are passed by value, not reference)
CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-voltage.rst
CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-tone.rst
CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst
Merging fbdev/fbdev-for-next (a8feae091106 uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening)
Merging pm/linux-next (9b87b566ba4b Merge branch 'device-properties' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start())
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (2ee87db3a287 Merge branch 'nfp-get_phys_port_name-for-representors-and-SR-IOV-reorder')
CONFLICT (content): Merge conflict in drivers/net/wireless/marvell/mwifiex/pcie.c
CONFLICT (content): Merge conflict in drivers/net/macvlan.c
Applying: remove duplicate ethernet node intruduced by merge
Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message)
Merging netfilter-next/master (04ba724b659c netfilter: nfnetlink: extended ACK reporting)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (57c00f2fac51 brcmfmac: Fix a memory leak in error handling path in 'brcmf_cfg80211_attach')
Merging bluetooth/master (5da8e47d849d Bluetooth: hidp: fix possible might sleep error in hidp_session_thread)
Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups')
Merging rdma/for-next (4931c6ef04b4 net/mlx4_en: Optimized single ring steering)
Merging gfs2/for-next (722f6f62a563 GFS2: Eliminate vestigial sd_log_flush_wrapped)
Merging mtd/master (05e97a9eda72 Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD)
Merging l2-mtd/master (c169e3d3c049 mtd: partitions: fixup some allocate_partition() whitespace)
Merging nand/nand/next (edfee3619c49 mtd: nand: mtk: add ->setup_data_interface() hook)
Merging spi-nor/spi-nor/next (1a18915b4971 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables)
Merging crypto/master (30b4c54ccdeb crypto: ccp - Release locks before returning)
Merging drm/drm-next (6d61e70ccc21 Backmerge tag 'v4.12-rc7' into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (bdbbf7d619d1 drm/i915: Clear execbuf's vma backpointer upon release)
Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy)
Merging drm-misc/for-linux-next (c048c984de38 Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (4a630fadbb29 drm/msm: Fix potential buffer overflow issue)
Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
Merging mali-dp/for-upstream/mali-dp (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation)
Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline)
Merging imx-drm/imx-drm/next (994fc62e1d04 drm/imx: lock scanout transfers for consecutive bursts)
Merging etnaviv/etnaviv/next (46a269da7e8a drm/etnaviv: restore ETNA_PREP_NOSYNC behaviour)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (5ea32fb24a83 Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and 'regmap/topic/lzo' into regmap-next)
Merging sound/for-next (b602aa8eb1a0 ALSA: pcm: Disable only control mmap for explicit appl_ptr sync)
Merging sound-asoc/for-next (f08c17370aea Merge remote-tracking branch 'asoc/topic/zx-aud96p22' into asoc-next)
CONFLICT (content): Merge conflict in drivers/of/base.c
Applying: of_graph: merge fix up for creating of drivers/of/property.c
Merging modules/modules-next (165d1cc0074b kmod: reduce atomic operations on kmod_concurrent and simplify)
Merging input/next (be19788c73d3 Input: xpad - sync supported devices with XBCD)
Merging block/for-next (2c4a9e73b3c6 Merge branch 'for-4.13/block' into for-next)
CONFLICT (content): Merge conflict in mm/filemap.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in fs/ext4/file.c
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.h
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.h
CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.h
CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.c
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/md/dm-raid1.c
CONFLICT (content): Merge conflict in drivers/md/dm-io.c
Applying: s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t"
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (0aefb813be29 dm thin: do not queue freed thin mapping for next stage processing)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (2fe35968fecc mmc: renesas-sdhi: improve checkpatch cleanness)
CONFLICT (content): Merge conflict in drivers/mmc/core/block.c
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (7f053a6a7455 MD: fix a null dereference)
Applying: md: fix up for "blk: replace bioset_create_nobvec() with a flags arg to bioset_create()"
Merging mfd/for-mfd-next (d905cd268c76 dt-bindings: vendor-prefixes: Add arctic to vendor prefix)
Merging backlight/for-backlight-next (7e715c2d9c27 backlight: Report error on failure)
Merging battery/for-next (bfa953d336cd power: supply: sbs-battery: Don't needlessly set CAPACITY_MODE)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (5b5ca94679d5 Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next)
Merging security/next (c377a2c8eaaa Merge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next)
Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option)
Merging keys/keys-next (3088c2ad40cf Merge remote-tracking branch 'origin/keys-fixes' into keys-next)
CONFLICT (content): Merge conflict in security/keys/dh.c
Merging selinux/next (6a3911837da0 selinux: enable genfscon labeling for tracefs)
Merging tpmdd/next (7df12cdde474 tpm: consolidate the TPM startup code)
Merging watchdog/master (3a9aedb282ac watchdog: w83627hf: Add support for NCT6793D and NCT6795D)
Merging iommu/next (c71bf5f13305 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7b3a10df1d4b vfio: Use ERR_CAST() instead of open coding it)
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (cd33f5f2cbfa audit: make sure we never skip the multicast broadcast)
Merging devicetree/for-next (ce4fecf1fe15 vsprintf: Add %p extension "%pOF" for device tree)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/ethernet.txt
Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver)
Merging spi/for-next (aacc6307f188 Merge remote-tracking branches 'spi/topic/st-ssc4' and 'spi/topic/stm32' into spi-next)
Merging tip/auto-latest (fb01f68ee7a4 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in net/bluetooth/hidp/core.c
CONFLICT (content): Merge conflict in net/bluetooth/cmtp/core.c
CONFLICT (content): Merge conflict in net/bluetooth/bnep/core.c
CONFLICT (content): Merge conflict in kernel/irq/affinity.c
CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c
CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/arm/include/uapi/asm/Kbuild
CONFLICT (modify/delete): Documentation/DocBook/kernel-hacking.tmpl deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of Documentation/DocBook/kernel-hacking.tmpl left in tree.
$ git rm -f Documentation/DocBook/kernel-hacking.tmpl
Applying: sched/wait: fix up for "docs-rst: convert kernel-hacking to ReST"
Applying: Bluetooth: hidp: fix for "sched/wait: Rename wait_queue_t => wait_queue_entry_t"
Merging clockevents/clockevents/next (d9569035d594 clocksource: Add an alias macro CLOCKSOURCE_OF_DECLARE)
CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h
CONFLICT (content): Merge conflict in drivers/clocksource/timer-fttmr010.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-moxart/Kconfig
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (77641dacead2 EDAC, pnd2: Make function sbi_send() static)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (681bec0367c2 tracing: Rename update the enum_map file)
Merging rcu/rcu/next (49729e9a4e67 torture: Fix typo suppressing CPU-hotplug statistics)
Merging kvm/linux-next (865279c53ca9 tools/kvm_stat: display guest list in pid/guest selection screens)
Merging kvm-arm/next (d38338e396ee arm64: Remove a redundancy in sysreg.h)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (579006944e0d KVM: PPC: Book3S HV: Virtualize doorbell facility on POWER9)
Merging kvms390/next (1cae025577f4 KVM: s390: avoid packed attribute)
CONFLICT (content): Merge conflict in arch/s390/kvm/gaccess.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/kvm_host.h
Merging xen-tip/linux-next (a5d5f328b0e2 xen: allocate page for shared info page from low memory)
CONFLICT (content): Merge conflict in drivers/xen/events/events_base.c
Merging percpu/for-next (303abfdf76ea percpu: fix early calls for spinlock in pcpu_stats)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (f4d342cf900a platform/x86: silead_dmi: Add touchscreen info for PoV mobii wintab p800w)
Merging chrome-platform/for-next (5d6a312e8f99 platform/chrome: cros_ec_lightbar - hide unused PM functions)
Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions)
Merging leds/for-next (64601cb1343f leds: Remove SEAD-3 driver)
Merging ipmi/for-next (0944d889a237 ipmi: Convert DMI handling over to a platform device)
Merging driver-core/driver-core-next (d565ed38d045 arm: mach-rpc: ecard: fix build error)
Merging usb/usb-next (9c691cc9f8b5 usb: musb: tusb6010_omap: Convert to DMAengine API)
Merging usb-gadget/next (0591bc236015 usb: gadget: add f_uac1 variant based on a new u_audio api)
Merging usb-serial/usb-next (c22ac6d29f18 USB: serial: propagate late probe errors)
Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure)
Merging phy-next/next (af850e14a7ae phy: bcm-ns-usb3: add MDIO driver using proper bus layer)
Merging tty/tty-next (9f60e0e7aea6 tty/serial: meson_uart: update to stable bindings)
CONFLICT (content): Merge conflict in include/linux/platform_data/atmel.h
Merging char-misc/char-misc-next (cbbdc6082917 misc: apds990x: Use sysfs_match_string() helper)
CONFLICT (content): Merge conflict in Documentation/admin-guide/index.rst
CONFLICT (modify/delete): Documentation/DocBook/w1.tmpl deleted in HEAD and modified in char-misc/char-misc-next. Version char-misc/char-misc-next of Documentation/DocBook/w1.tmpl left in tree.
$ git rm -f Documentation/DocBook/w1.tmpl
Applying: docs-rst: merge fix for "DocBook: w1: Update W1 file locations and names in DocBook"
Merging extcon/extcon-next (1f4be24786b8 extcon: int3496: Switch to devm_acpi_dev_add_driver_gpios())
Merging staging/staging-next (8a21ff775f56 staging: speakup: make ttyio synths use device name)
CONFLICT (content): Merge conflict in include/uapi/linux/tty.h
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (e9446e2b2d9d Merge branch 'for-linus' into next)
Merging cgroup/for-next (39fd64ae9f47 cgroup: "cgroup.subtree_control" should be writeable by delegatee)
Merging scsi/for-next (80de14915dae Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_fc.c
CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c
Merging scsi-mkp/for-next (f62f9ffdb5ef scsi: sun_esp: fix device reference leaks)
Merging target-updates/for-next (055c758171c9 tcmu: make array tcmu_attrib_attrs static const)
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c
Applying: qla2xxx: fix up for bad merge fix
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging libata/for-next (5894b6212dd6 Merge branch 'for-4.13' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (e41b1355508d virtio_balloon: disable VIOMMU support)
Merging rpmsg/for-next (9cbbe36c425f Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (f245d9ef6616 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (40dadbafbdb4 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-samsung/for-next (a453f3693f2a pinctrl: samsung: Explicitly cast pointer returned by of_iomap() to iomem)
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' 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 (296990deb389 mnt: Make propagate_umount less slow for overlapping mount propagation trees)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (e2682130931f random: suppress spammy warnings about unseeded randomness)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (66ec5edabf11 selftests: intel_pstate: add .gitignore)
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in Documentation/dev-tools/index.rst
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging coresight/next (92cd7037795e arm64: dts: qcom: msm8916: Add debug unit)
Merging rtc/rtc-next (9f4ad359c801 rtc: brcmstb-waketimer: Add Broadcom STB wake-timer)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging kspp/for-next/kspp (b3645fbb0553 Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp)
CONFLICT (content): Merge conflict in include/linux/fs.h
Applying: apparmor: put back designators in struct initialisers
Applying: fs: don't read an enum directly from a u64 __user *
Merging akpm-current/current (9ea4131ee41d ipc/util.h: update documentation for ipc_getref() and ipc_putref())
CONFLICT (modify/delete): tools/testing/selftests/sysctl/run_stringtests deleted in akpm-current/current and modified in HEAD. Version HEAD of tools/testing/selftests/sysctl/run_stringtests left in tree.
CONFLICT (modify/delete): tools/testing/selftests/sysctl/run_numerictests deleted in akpm-current/current and modified in HEAD. Version HEAD of tools/testing/selftests/sysctl/run_numerictests left in tree.
CONFLICT (modify/delete): tools/testing/selftests/sysctl/common_tests deleted in akpm-current/current and modified in HEAD. Version HEAD of tools/testing/selftests/sysctl/common_tests left in tree.
CONFLICT (content): Merge conflict in include/linux/sem.h
CONFLICT (content): Merge conflict in include/linux/random.h
CONFLICT (content): Merge conflict in include/linux/ipc.h
$ git rm -f tools/testing/selftests/sysctl/common_tests tools/testing/selftests/sysctl/run_numerictests tools/testing/selftests/sysctl/run_stringtests
$ git checkout -b akpm remotes/origin/akpm/master
Applying: net/netfilter/x_tables.c: use kvmalloc() in xt_alloc_table_info()
Applying: kernel/watchdog: remove unused declaration
Applying: kernel/watchdog: introduce arch_touch_nmi_watchdog()
Applying: kernel/watchdog: split up config options
Applying: watchdog-split-up-config-options-fix
Applying: kernel/watchdog: provide watchdog_nmi_reconfigure() for arch watchdogs
Applying: watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix
Applying: kernel/watchdog: hide unused function
Applying: powerpc/64s: implement arch-specific hardlockup watchdog
Applying: powerpc/64s: watchdog honor watchdog disable at boot/hotplug
Applying: powerpc-64s-implement-arch-specific-hardlockup-watchdog-checkpatch-fixes
Applying: efi: avoid fortify checks in EFI stub
Applying: kexec_file: adjust declaration of kexec_purgatory
Applying: IB/rxe: do not copy extra stack memory to skb
Applying: powerpc: don't fortify prom_init
Applying: powerpc: make feature-fixup tests fortify-safe
Applying: include/linux/string.h: add the option of fortified string.h functions
Applying: x86: fix fortified memcpy
Applying: fortify: avoid panic() in favor of BUG()
Applying: sh: mark end of BUG() implementation as unreachable
Applying: x86/mmap: properly account for stack randomization in mmap_base
Applying: arm64/mmap: properly account for stack randomization in mmap_base
Applying: powerpc,mmap: properly account for stack randomization in mmap_base
Applying: MIPS: do not use __GFP_REPEAT for order-0 request
Applying: mm, tree wide: replace __GFP_REPEAT by __GFP_RETRY_MAYFAIL with more useful semantic
Applying: mm-tree-wide-replace-__gfp_repeat-by-__gfp_retry_mayfail-with-more-useful-semantic-fix
Applying: mm-tree-wide-replace-__gfp_repeat-by-__gfp_retry_mayfail-with-more-useful-semantic-fix
Applying: mm-tree-wide-replace-__gfp_repeat-by-__gfp_retry_mayfail-with-more-useful-semantic-fix-3
Applying: xfs: map KM_MAYFAIL to __GFP_RETRY_MAYFAIL
Applying: mm: kvmalloc support __GFP_RETRY_MAYFAIL for all sizes
Applying: drm/i915: use __GFP_RETRY_MAYFAIL
Applying: mm, migration: do not trigger OOM killer when migrating memory
Applying: sparc64: NG4 memset 32 bits overflow
Applying: xtensa: use generic fb.h
Applying: writeback: rework wb_[dec|inc]_stat family of functions
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (8b2d10808084 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
^ permalink raw reply
* Re: linux-next: manual merge of the block tree with the file-locks tree
From: Jeff Layton @ 2017-06-28 9:54 UTC (permalink / raw)
To: Jens Axboe, Stephen Rothwell, Al Viro
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <4feec680-6d4f-abbe-c025-61b462612dde@kernel.dk>
On Tue, 2017-06-27 at 20:01 -0600, Jens Axboe wrote:
> On 06/27/2017 07:57 PM, Stephen Rothwell wrote:
> > Hi Jens,
> >
> > Today's linux-next merge of the block tree got a conflict in:
> >
> > include/linux/fs.h
> >
> > between commit:
> >
> > 3f64df8a51ce ("fs: new infrastructure for writeback error handling and reporting")
> >
> > from the file-locks tree and commit:
> >
> > c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
> >
> > from the block tree.
>
> Looks like we stole the same hole! Let's just merge it like this, then
> post merge I (or Jeff) can move the member to a better location.
>
(cc'ing Al since he might pick these up...)
Indeed!
I'll plan to move f_wb_err to the end of the struct.
I have some later patches that add a second 32-bit errseq_t field to
struct file for tracking metadata writeback errors. That would make them
adjacent to one another which at least looks a little cleaner.
Cheers,
--
Jeff Layton <jlayton@poochiereds.net>
^ permalink raw reply
* next-20170628 build: 0 failures 7 warnings (next-20170628)
From: Build bot for Mark Brown @ 2017-06-28 11:02 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170628
Git describe: next-20170628
Commit: a51166ce71 Add linux-next specific files for 20170628
Build Time: 0 min 11 sec
Passed: 7 / 7 (100.00 %)
Failed: 0 / 7 ( 0.00 %)
Errors: 0
Warnings: 7
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm-multi_v5_defconfig
2 warnings 0 mismatches : arm-multi_v7_defconfig
1 warnings 0 mismatches : x86_64-defconfig
4 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : x86_64-allnoconfig
2 warnings 0 mismatches : arm-multi_v4t_defconfig
-------------------------------------------------------------------------------
Warnings Summary: 7
4 ../drivers/ata/libata-scsi.c:4194:1: warning: label 'unspprt_sa' defined but not used [-Wunused-label]
3 ../kernel/sched/fair.c:2657:9: warning: its scope is only this definition or declaration, which is probably not what you want
3 ../kernel/sched/fair.c:2657:9: warning: 'struct sched_domain' declared inside parameter list
2 ../drivers/rtc/rtc-brcmstb-waketimer.c:142:6: warning: unused variable 'ret' [-Wunused-variable]
1 ../kernel/sched/fair.c:2655:44: warning: 'struct sched_domain' declared inside parameter list will not be visible outside of this definition or declaration
1 ../include/uapi/linux/byteorder/big_endian.h:32:26: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/staging/media/imx/imx-media-of.c:216:4: warning: 'remote_np' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:4194:1: warning: label 'unspprt_sa' defined but not used [-Wunused-label]
../kernel/sched/fair.c:2657:9: warning: 'struct sched_domain' declared inside parameter list
../kernel/sched/fair.c:2657:9: warning: its scope is only this definition or declaration, which is probably not what you want
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:4194:1: warning: label 'unspprt_sa' defined but not used [-Wunused-label]
../drivers/rtc/rtc-brcmstb-waketimer.c:142:6: warning: unused variable 'ret' [-Wunused-variable]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:4194:1: warning: label 'unspprt_sa' defined but not used [-Wunused-label]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:4194:1: warning: label 'unspprt_sa' defined but not used [-Wunused-label]
../drivers/rtc/rtc-brcmstb-waketimer.c:142:6: warning: unused variable 'ret' [-Wunused-variable]
../include/uapi/linux/byteorder/big_endian.h:32:26: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/staging/media/imx/imx-media-of.c:216:4: warning: 'remote_np' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../kernel/sched/fair.c:2657:9: warning: 'struct sched_domain' declared inside parameter list
../kernel/sched/fair.c:2657:9: warning: its scope is only this definition or declaration, which is probably not what you want
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../kernel/sched/fair.c:2655:44: warning: 'struct sched_domain' declared inside parameter list will not be visible outside of this definition or declaration
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../kernel/sched/fair.c:2657:9: warning: 'struct sched_domain' declared inside parameter list
../kernel/sched/fair.c:2657:9: warning: its scope is only this definition or declaration, which is probably not what you want
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Jens Axboe @ 2017-06-28 12:43 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Martin K. Petersen, Michael Ellerman, Benjamin Herrenschmidt,
PowerPC
In-Reply-To: <20170628180456.30cb9242@canb.auug.org.au>
On 06/28/2017 02:04 AM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> fs/fcntl.o: In function `do_fcntl':
> fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
> fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'
>
> Probably caused by commit
>
> c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
>
> On powerpc (at least) you cannot use get_user() to fetch anything larger
> than "unsigned long" i.e. 32 bits on 32 bit powerpc.
>
> This has been discussed before (and, I think, a fix attempted).
Gah, thanks for letting me know. I'll test your patch and queue it
up to fix this issue.
--
Jens Axboe
^ permalink raw reply
* Re: linux-next: manual merge of the block tree with the file-locks tree
From: Jens Axboe @ 2017-06-28 12:44 UTC (permalink / raw)
To: Jeff Layton, Stephen Rothwell, Al Viro
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <1498643640.4644.1.camel@poochiereds.net>
On 06/28/2017 03:54 AM, Jeff Layton wrote:
> On Tue, 2017-06-27 at 20:01 -0600, Jens Axboe wrote:
>> On 06/27/2017 07:57 PM, Stephen Rothwell wrote:
>>> Hi Jens,
>>>
>>> Today's linux-next merge of the block tree got a conflict in:
>>>
>>> include/linux/fs.h
>>>
>>> between commit:
>>>
>>> 3f64df8a51ce ("fs: new infrastructure for writeback error handling and reporting")
>>>
>>> from the file-locks tree and commit:
>>>
>>> c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
>>>
>>> from the block tree.
>>
>> Looks like we stole the same hole! Let's just merge it like this, then
>> post merge I (or Jeff) can move the member to a better location.
>>
>
> (cc'ing Al since he might pick these up...)
>
> Indeed!
>
> I'll plan to move f_wb_err to the end of the struct.
>
> I have some later patches that add a second 32-bit errseq_t field to
> struct file for tracking metadata writeback errors. That would make them
> adjacent to one another which at least looks a little cleaner.
OK perfect, I'll just ignore the issue then :-)
--
Jens Axboe
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Jens Axboe @ 2017-06-28 14:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Martin K. Petersen, Michael Ellerman, Benjamin Herrenschmidt,
PowerPC
In-Reply-To: <664cc88d-18a5-18c4-5bce-4d4352d15f4f@kernel.dk>
On 06/28/2017 06:43 AM, Jens Axboe wrote:
> On 06/28/2017 02:04 AM, Stephen Rothwell wrote:
>> Hi Jens,
>>
>> After merging the block tree, today's linux-next build (powerpc
>> allnoconfig) failed like this:
>>
>> fs/fcntl.o: In function `do_fcntl':
>> fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
>> fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'
>>
>> Probably caused by commit
>>
>> c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
>>
>> On powerpc (at least) you cannot use get_user() to fetch anything larger
>> than "unsigned long" i.e. 32 bits on 32 bit powerpc.
>>
>> This has been discussed before (and, I think, a fix attempted).
>
> Gah, thanks for letting me know. I'll test your patch and queue it
> up to fix this issue.
But put_user() is fine? Just checking here, since the change adds
both a u64 put and get user.
--
Jens Axboe
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Jens Axboe @ 2017-06-28 15:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Martin K. Petersen, Michael Ellerman, Benjamin Herrenschmidt,
PowerPC
In-Reply-To: <2bd17edb-4a5b-5bf8-7074-1156a5249325@kernel.dk>
On 06/28/2017 08:01 AM, Jens Axboe wrote:
> On 06/28/2017 06:43 AM, Jens Axboe wrote:
>> On 06/28/2017 02:04 AM, Stephen Rothwell wrote:
>>> Hi Jens,
>>>
>>> After merging the block tree, today's linux-next build (powerpc
>>> allnoconfig) failed like this:
>>>
>>> fs/fcntl.o: In function `do_fcntl':
>>> fcntl.c:(.text+0x6d4): undefined reference to `__get_user_bad'
>>> fcntl.c:(.text+0x730): undefined reference to `__get_user_bad'
>>>
>>> Probably caused by commit
>>>
>>> c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
>>>
>>> On powerpc (at least) you cannot use get_user() to fetch anything larger
>>> than "unsigned long" i.e. 32 bits on 32 bit powerpc.
>>>
>>> This has been discussed before (and, I think, a fix attempted).
>>
>> Gah, thanks for letting me know. I'll test your patch and queue it
>> up to fix this issue.
>
> But put_user() is fine? Just checking here, since the change adds
> both a u64 put and get user.
I just changed all 4, at least that provides some symmetry in how
we copy things in and out for that set of fcntls.
--
Jens Axboe
^ permalink raw reply
* Re: linux-next: build warning after merge of the libata tree
From: Tejun Heo @ 2017-06-28 18:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Minwoo Im,
Bart Van Assche
In-Reply-To: <20170628155117.5bfbf545@canb.auug.org.au>
On Wed, Jun 28, 2017 at 03:51:17PM +1000, Stephen Rothwell wrote:
> Hi Tejun,
>
> After merging the libata tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
>
> drivers/ata/libata-scsi.c: In function 'ata_scsi_var_len_cdb_xlat':
> drivers/ata/libata-scsi.c:4194:1: warning: label 'unspprt_sa' defined but not used [-Wunused-label]
> unspprt_sa:
> ^
>
> Introduced by commit
>
> b1ffbf854e08 ("libata: Support for an ATA PASS-THROUGH(32) command.")
Fixed up. Sorry about that.
Thanks.
--
tejun
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Stephen Rothwell @ 2017-06-28 21:33 UTC (permalink / raw)
To: Jens Axboe
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Martin K. Petersen, Michael Ellerman, Benjamin Herrenschmidt,
PowerPC
In-Reply-To: <2c4503f8-8284-2578-3622-03529cc8bffe@kernel.dk>
Hi Jens,
On Wed, 28 Jun 2017 09:11:32 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 06/28/2017 08:01 AM, Jens Axboe wrote:
> > But put_user() is fine? Just checking here, since the change adds
> > both a u64 put and get user.
Yes, put_user is fine (it does 2 4 byte moves. The asm is there to do
the 8 byte get_user, but the surrounding C code uses an unsigned long
for the destination in all cases (some other arches do the same). I
don't remember why it is like that.
> I just changed all 4, at least that provides some symmetry in how
> we copy things in and out for that set of fcntls.
OK, thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: unsigned commit in the libata tree
From: Stephen Rothwell @ 2017-06-28 21:54 UTC (permalink / raw)
To: Tejun Heo; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Tejun,
I appreciate the fix, but commit
bb6133c54b97 ("libata: fix build warning from unused goto label")
has no Signed-off-by tag.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: Adding nfc-next to linux-next
From: Stephen Rothwell @ 2017-06-28 22:05 UTC (permalink / raw)
To: Samuel Ortiz
Cc: Linux Next Mailing List, David S. Miller, Networking,
Linux Wireless List, Linux NFC List
In-Reply-To: <20170628072531.GM21214-nKCvNrh56OquJmZzmsDdo1DQ4js95KgL@public.gmane.org>
Hi Samuel,
On Wed, 28 Jun 2017 09:25:31 +0200 Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> wrote:
>
> Could you please add the nfc-next tree to linux-next?
>
> It's here:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git/
>
> and the branch is the master one.
Added from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgement of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
^ permalink raw reply
* Re: linux-next: manual merge of the tip tree with the pci tree
From: Christoph Hellwig @ 2017-06-29 0:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Bjorn Helgaas, Linux-Next Mailing List, Linux Kernel Mailing List,
Michael Hernandez, Himanshu Madhani, Christoph Hellwig
In-Reply-To: <20170628131534.1d549e19@canb.auug.org.au>
On Wed, Jun 28, 2017 at 01:15:34PM +1000, Stephen Rothwell wrote:
> 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.
The merge looks fine to me.
^ permalink raw reply
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2017-06-29 1:54 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Bard Liao
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/soc/codecs/rt5670.c: In function 'rt5670_set_codec_sysclk':
sound/soc/codecs/rt5670.c:2448:57: error: 'codec' undeclared (first use in this function)
struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);
^
sound/soc/codecs/rt5670.c:2448:57: note: each undeclared identifier is reported only once for each function it appears in
sound/soc/codecs/rt5670.c: At top level:
sound/soc/codecs/rt5670.c:2775:16: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.set_sysclk = rt5670_set_codec_sysclk,
^
sound/soc/codecs/rt5670.c:2775:16: note: (near initialization for 'soc_codec_dev_rt5670.set_sysclk')
cc1: some warnings being treated as errors
Caused by commit
6c28ce3c425e ("ASoC: rt5670: move set_sysclk to codec level")
I have used the sound-asoc tree from next-20170628 for today.
--
Cheers,
Stephen Rothwell
^ 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