linux-next: Tree for Dec 7

2018-12-07 Thread Stephen Rothwell
Hi all,

Changes since 20181206:

The arm64 tree gained a conflict against Linus' tree.

The risc-v tree gained a conflict against the dma-mapping tree.

The jc_docs tree gained a conflict against the fscrypt tree.

The thermal tree gained a build failure so I used the version from
next-20181206.

The rdma tree still had its build failure so I used the version from
next-20181203.

The net-next tree gained a conflict against the net tree.

The drm tree gained conflicts against the drm-fixes tree.

The drm-misc tree lost its build failure.

The device-mapper tree lost its build failure.

The rcu tree gained conflicts against the net-next tree.

The akpm-current tree still had its build failure for which I added a
fix patch.

Non-merge commits (relative to Linus' tree): 7106
 7510 files changed, 340314 insertions(+), 192338 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 288 trees (counting Linus' and 68 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 (abb8d6ecbd8f Merge tag 'trace-v4.20-rc5' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement 
reads{x}()/writes{x}())
Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential 
uninitialized return)
Merging arm64-fixes/for-next/fixes (ea2412dc21cc ACPI/IORT: Fix 
iort_get_platform_device_domain() uninitialized pointer value)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when 
setting up legacy consoles)
Merging sparc/master (cf76c364a1e1 Merge tag 'scsi-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (ebaf39e6032f ipv4: ipv6: netfilter: Adjust the frag mem 
limit when truesize changes)
Merging bpf/master (b2b7af861122 tcp: fix NULL ref in tail loss probe)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (4c05ec47384a netfilter: nf_tables: fix suspicious RCU 
usage in nft_chain_stats_replace())
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (312ca38ddda6 cfg80211: Fix busy loop regression in 
ieee80211_ie_split_ric())
Merging rdma-fixes/for-rc (37b06e507897 IB/mlx5: Fix implicit ODP interrupted 
page fault)
Merging sound-current/for-linus (b72f936f6b32 ALSA: hda/realtek: Fix mic issue 
on Acer AIO Veriton Z4860G/Z6860G)
Merging sound-asoc-fixes/for-linus (cc5dcb7578f8 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (0b35c52dfacf Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (92e932e6ff58 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (b07b864ee423 Revert "PCI/ASPM: Do not initialize 
link state when aspm_disabled is set&q

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

2018-12-06 Thread Stephen Rothwell
Hi all,

On Tue, 4 Dec 2018 09:42:59 + Leon Romanovsky  wrote:
>
> On Tue, Dec 04, 2018 at 01:52:54AM +, Jason Gunthorpe wrote:
> > On Tue, Dec 04, 2018 at 11:47:31AM +1100, Stephen Rothwell wrote:  
> > >
> > > After merging the rdma tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > ERROR: "mlx5_get_send_wqe" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] 
> > > undefined!
> > >
> > > Caused by commit
> > >
> > >   34f4c9554d8b ("IB/mlx5: Use fragmented QP's buffer for in-kernel users")
> > >
> > > mlx5_get_send_wqe() is still used in drivers/infiniband/hw/mlx5/cq.c
> > > and declared in drivers/infiniband/hw/mlx5/mlx5_ib.h ...
> > >
> > > I have used the version of the rdma tree from next-20181203 for today.  
> >
> > Huh. So apparently every compiler that tested this patch (0-day, mine,
> > the submitters) optimized this call away because is_atomic_response()
> > always returns 0: meaning mlx5_get_atomic_laddr is never callable and
> > can be deleted entirely, including the call to mlx5_get_send_wqe.
> >
> > Not sure what compiler setup will hit this, but it is clearly wrong
> > code..
> >
> > Guy/Leon, please send a fixup.. Maybe just delete all this
> > handle_atomics stuff?  
> 
> I deleted it and will wait for the results of regression prior to send the 
> patch.

I am still getting this error.

-- 
Cheers,
Stephen Rothwell


pgpaqco9qxMqt.pgp
Description: OpenPGP digital signature


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

2018-12-06 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/dsa/master.c

between commit:

  a3d7e01da060 ("net: dsa: Fix tagging attribute location")

from the net tree and commit:

  dc0fe7d47f9f ("net: dsa: Set the master device's MTU to account for DSA 
overheads")

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 net/dsa/master.c
index 5e8c9bef78bd,42f525bc68e2..
--- a/net/dsa/master.c
+++ b/net/dsa/master.c
@@@ -158,31 -158,24 +158,47 @@@ static void dsa_master_ethtool_teardown
cpu_dp->orig_ethtool_ops = NULL;
  }
  
 +static ssize_t tagging_show(struct device *d, struct device_attribute *attr,
 +  char *buf)
 +{
 +  struct net_device *dev = to_net_dev(d);
 +  struct dsa_port *cpu_dp = dev->dsa_ptr;
 +
 +  return sprintf(buf, "%s\n",
 + dsa_tag_protocol_to_str(cpu_dp->tag_ops));
 +}
 +static DEVICE_ATTR_RO(tagging);
 +
 +static struct attribute *dsa_slave_attrs[] = {
 +  _attr_tagging.attr,
 +  NULL
 +};
 +
 +static const struct attribute_group dsa_group = {
 +  .name   = "dsa",
 +  .attrs  = dsa_slave_attrs,
 +};
 +
+ void dsa_master_set_mtu(struct net_device *dev, struct dsa_port *cpu_dp)
+ {
+   unsigned int mtu = ETH_DATA_LEN + cpu_dp->tag_ops->overhead;
+   int err;
+ 
+   rtnl_lock();
+   if (mtu <= dev->max_mtu) {
+   err = dev_set_mtu(dev, mtu);
+   if (err)
+   netdev_dbg(dev, "Unable to set MTU to include for DSA 
overheads\n");
+   }
+   rtnl_unlock();
+ }
+ 
  int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
  {
 +  int ret;
 +
+   dsa_master_set_mtu(dev,  cpu_dp);
+ 
/* If we use a tagging format that doesn't have an ethertype
 * field, make sure that all packets from this point on get
 * sent to the tag format's receive function.


pgp1h2qiOLeCI.pgp
Description: OpenPGP digital signature


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

2018-12-06 Thread Stephen Rothwell
Hi Zhang,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/qcom/qcom-spmi-temp-alarm.c:26:10: fatal error: thermal_core.h: 
No such file or directory
 #include "thermal_core.h"
  ^~~~

Caused by commit

  150a4fe8c335 ("drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom 
subdir")

I have used the thermal tree from next-20181206 for today.

-- 
Cheers,
Stephen Rothwell


pgpy7mHrjj89f.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the jc_docs tree with the fscrypt tree

2018-12-06 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the jc_docs tree got a conflict in:

  Documentation/filesystems/index.rst

between commit:

  1b71a6809f96 ("fs-verity: add a documentation file")

from the fscrypt tree and commit:

  7bbfd9ad8eb2 ("Documentation: convert path-lookup from markdown to 
resturctured text")

from the jc_docs 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 Documentation/filesystems/index.rst
index 818390c32be6,ba921bdd5b06..
--- a/Documentation/filesystems/index.rst
+++ b/Documentation/filesystems/index.rst
@@@ -360,13 -360,13 +360,24 @@@ encryption of files and directories
  
  fscrypt
  
 +Verity API
 +==
 +
 +A library which filesystems can hook into to support transparent
 +authentication of read-only files.
 +
 +.. toctree::
 +:maxdepth: 2
 +
 +fsverity
++
+ Pathname lookup
+ ===
+ 
+ Pathname lookup in Linux is a complex beast; the document linked below
+ provides a comprehensive summary for those looking for the details.
+ 
+ .. toctree::
+:maxdepth: 2
+ 
+path-lookup.rst


pgpQNzTArkqTc.pgp
Description: OpenPGP digital signature


Re: linux-next: bad merge in the y2038 tree

2018-12-06 Thread Stephen Rothwell
Hi Arnd,

On Thu, 6 Dec 2018 23:09:01 +0100 Arnd Bergmann  wrote:
>
> On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell  wrote:
> >
> > The y2038 tree contains a merge of next-20181206.  I cannot use a tree
> > that includes a version of linux-next.  I assume that this was just a
> > test merge, so please remove it.  
> 
> Fixed now, I had pushed the wrong branch after I had done the test build to
> make sure that it wouldn't conflict with anything in yesterday's linux-next.

I figured something like that.  Thanks.

-- 
Cheers,
Stephen Rothwell


pgpaX5AYavLAN.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the risc-v tree with the dma-mapping tree

2018-12-06 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  Documentation/features/io/sg-chain/arch-support.txt

between commit:

  7c703e54cc71 ("arch: switch the default on ARCH_HAS_SG_CHAIN")

from the dma-mapping tree and commits:

  1df4d3866118 ("doc: features-refresh.sh for csky")
  1b9f89553571 ("doc: Indicate that xtensa supports sg-chain")

from the risc-v 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


pgpiJ3G0_TaM6.pgp
Description: OpenPGP digital signature


linux-next: Signed-off-by missing for commit in the device-mapper tree

2018-12-06 Thread Stephen Rothwell
Hi all,

Commit

  d569b5efedfd ("dm flakey: Properly corrupt multi-page bios.")

is missing a Signed-off-by from its author.

-- 
Cheers,
Stephen Rothwell


pgpwh3Rpn5zR_.pgp
Description: OpenPGP digital signature


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

2018-12-06 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the arm64 tree got a conflict in:

  arch/arm64/kernel/cpu_errata.c

between commit:

  ce8c80c536da ("arm64: Add workaround for Cortex-A76 erratum 1286807")

from Linus' tree and commit:

  c9460dcb06ee ("arm64: capabilities: Merge entries for 
ARM64_WORKAROUND_CLEAN_CACHE")

from the arm64 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/kernel/cpu_errata.c
index 6ad715d67df8,bb44635026f8..
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@@ -570,21 -570,43 +570,57 @@@ static const struct midr_range arm64_ha
  
  #endif
  
 +#ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI
 +
 +static const struct midr_range arm64_repeat_tlbi_cpus[] = {
 +#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009
 +  MIDR_RANGE(MIDR_QCOM_FALKOR_V1, 0, 0, 0, 0),
 +#endif
 +#ifdef CONFIG_ARM64_ERRATUM_1286807
 +  MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0),
 +#endif
 +  {},
 +};
 +
 +#endif
 +
- const struct arm64_cpu_capabilities arm64_errata[] = {
+ #ifdef CONFIG_CAVIUM_ERRATUM_27456
+ static const struct midr_range cavium_erratum_27456_cpus[] = {
+   /* Cavium ThunderX, T88 pass 1.x - 2.1 */
+   MIDR_RANGE(MIDR_THUNDERX, 0, 0, 1, 1),
+   /* Cavium ThunderX, T81 pass 1.0 */
+   MIDR_REV(MIDR_THUNDERX_81XX, 0, 0),
+   {},
+ };
+ #endif
+ 
+ #ifdef CONFIG_CAVIUM_ERRATUM_30115
+ static const struct midr_range cavium_erratum_30115_cpus[] = {
+   /* Cavium ThunderX, T88 pass 1.x - 2.2 */
+   MIDR_RANGE(MIDR_THUNDERX, 0, 0, 1, 2),
+   /* Cavium ThunderX, T81 pass 1.0 - 1.2 */
+   MIDR_REV_RANGE(MIDR_THUNDERX_81XX, 0, 0, 2),
+   /* Cavium ThunderX, T83 pass 1.0 */
+   MIDR_REV(MIDR_THUNDERX_83XX, 0, 0),
+   {},
+ };
+ #endif
+ 
+ #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003
+ static const struct arm64_cpu_capabilities qcom_erratum_1003_list[] = {
+   {
+   ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
+   },
+   {
+   .midr_range.model = MIDR_QCOM_KRYO,
+   .matches = is_kryo_midr,
+   },
+   {},
+ };
+ #endif
+ 
+ #ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE
+ static const struct midr_range workaround_clean_cache[] = {
  #if   defined(CONFIG_ARM64_ERRATUM_826319) || \
defined(CONFIG_ARM64_ERRATUM_827319) || \
defined(CONFIG_ARM64_ERRATUM_824069)
@@@ -697,23 -698,17 +712,17 @@@ const struct arm64_cpu_capabilities arm
},
  #ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003
{
-   .desc = "Qualcomm Technologies Falkor erratum 1003",
+   .desc = "Qualcomm Technologies Falkor/Kryo erratum 1003",
.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,
-   ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
-   },
-   {
-   .desc = "Qualcomm Technologies Kryo erratum 1003",
-   .capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,
-   .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
-   .midr_range.model = MIDR_QCOM_KRYO,
-   .matches = is_kryo_midr,
+   .matches = multi_entry_cap_matches,
+   .match_list = qcom_erratum_1003_list,
},
  #endif
 -#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009
 +#ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI
{
 -  .desc = "Qualcomm Technologies Falkor erratum 1009",
 +  .desc = "Qualcomm erratum 1009, ARM erratum 1286807",
.capability = ARM64_WORKAROUND_REPEAT_TLBI,
 -  ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
 +  ERRATA_MIDR_RANGE_LIST(arm64_repeat_tlbi_cpus),
},
  #endif
  #ifdef CONFIG_ARM64_ERRATUM_858921


pgp8QGpQFHTST.pgp
Description: OpenPGP digital signature


Re: dmapool regression in next

2018-12-06 Thread Stephen Rothwell
Hi all,

On Thu, 6 Dec 2018 08:33:15 -0800 Tony Lindgren  wrote:
>
> * Tony Battersby  [181206 16:13]:
> > On 12/6/18 10:51 AM, Robin Murphy wrote:  
> > >> Here is the prototype:
> > >>
> > >> void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma);
> > >>
> > >> With the old code, the 'dma' value had to be correct for use with
> > >> pool_find_page(), or else you would get an error.  If the 'vaddr' value
> > >> was incorrect, it would corrupt the dmapool freelist, but you wouldn't
> > >> get an error unless DMAPOOL_DEBUG was enabled.
> > >>
> > >> With my patch applied, 'vaddr' has to be correct for virt_to_page().  My
> > >> code also checks that 'dma' is consistent with 'vaddr' even if
> > >> DMAPOOL_DEBUG is disabled, since the check is fast and it will prevent
> > >> problems like this in the future.  
> > > Unfortunately that logic has a fatal flaw - DMA pools are backed by 
> > > dma_alloc_coherent(), and there is absolutely no guarantee that the 
> > > memory dma_alloc_coherent() returns is backed by a struct page at all. 
> > > Even if it is, there is still absolutely no guarantee that the vaddr 
> > > value it returns is valid for virt_to_page() - on many systems it will 
> > > be in vmalloc or some architecture-specific region of address space.
> > >
> > > The problem is not that these drivers are buggy (they're not - the arch 
> > > code is returning a vmalloc()ed non-cacheable remap in the first place), 
> > > it's that 26abe88e830d is fundamentally unworkable and needs reverting. 
> > > Apparently the original patches managed not to catch my eye as something 
> > > I needed to review, sorry about that :(
> > >
> > > Robin.
> > >  
> > Thanks for the info; the inner workings of the vm system are a bit out
> > of my area of expertise.  My first version of the patch series used a
> > different method that didn't rely on virt_to_page(); I will go back to
> > that version, clean it up, and resubmit when I have time.
> > 
> > Andrew, please revert all 9 patches.  I will resubmit the set when I
> > have a workable solution.  
> 
> OK sounds good to me. I can test the new set easily when available
> if you Cc me on them.

I have removed those patches from linux-next for today.

-- 
Cheers,
Stephen Rothwell


pgpgoM7gJzuAw.pgp
Description: OpenPGP digital signature


linux-next: Signed-off-by missing for commit in the sound-asoc tree

2018-12-06 Thread Stephen Rothwell
Hi all,

Commit

  972fd1f58267 ("ASoC: max9867: Remove useless assignment")

is missing a Signed-off-by from its author.

-- 
Cheers,
Stephen Rothwell


pgptMP2UjF6Sz.pgp
Description: OpenPGP digital signature


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

2018-12-06 Thread Stephen Rothwell
Hi Mike,

On Thu, 6 Dec 2018 08:41:06 -0500 Mike Snitzer  wrote:
>
> Sorry for the trouble.  I'll get this fixed up.

Thanks.

-- 
Cheers,
Stephen Rothwell


pgpJGFtEii3Nl.pgp
Description: OpenPGP digital signature


linux-next: bad merge in the y2038 tree

2018-12-06 Thread Stephen Rothwell
Hi Arnd,

The y2038 tree contains a merge of next-20181206.  I cannot use a tree
that includes a version of linux-next.  I assume that this was just a
test merge, so please remove it.

-- 
Cheers,
Stephen Rothwell


pgpQwGyf6VlXY.pgp
Description: OpenPGP digital signature


Re: linux-next: Tree for Dec 6

2018-12-06 Thread Stephen Rothwell
Hi all,

On Thu, 6 Dec 2018 19:18:51 +1100 Stephen Rothwell  
wrote:
>
> New trees: thunderbolt, thunderbolt-next

Actually thunderbolt-fixes ...

-- 
Cheers,
Stephen Rothwell


pgpxeS_sPCw8m.pgp
Description: OpenPGP digital signature


linux-next: Tree for Dec 6

2018-12-06 Thread Stephen Rothwell
Hi all,

Changes since 20181205:

New trees: thunderbolt, thunderbolt-next

The rdma tree still had its build failure so I used the version from
next-20181203.

The drm-misc tree gained a build failure so I used the version from
next-20181205.

The char-misc tree gained a conflict against the mmc tree.

The device-mapper tree gained a build failure so I reverted its changes
for today.

The akpm-current tree still had its build failure for which I added a
fix patch and gained conflicts against the powerpc tree.

The akpm tree gained a conflict against the btrfs-kdave tree.

Non-merge commits (relative to Linus' tree): 6703
 7132 files changed, 321132 insertions(+), 184362 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 288 trees (counting Linus' and 68 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 (d08970904582 Merge tag 'for-4.20-rc5-tag' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement 
reads{x}()/writes{x}())
Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential 
uninitialized return)
Merging arm64-fixes/for-next/fixes (ea2412dc21cc ACPI/IORT: Fix 
iort_get_platform_device_domain() uninitialized pointer value)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when 
setting up legacy consoles)
Merging sparc/master (f3f950dba37b Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (64d47902fea3 Merge tag 'mac80211-for-davem-2018-12-05' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging bpf/master (a92a72a24d48 Merge branch 'bpf-verifier-resilience')
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (4c05ec47384a netfilter: nf_tables: fix suspicious RCU 
usage in nft_chain_stats_replace())
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (312ca38ddda6 cfg80211: Fix busy loop regression in 
ieee80211_ie_split_ric())
Merging rdma-fixes/for-rc (37b06e507897 IB/mlx5: Fix implicit ODP interrupted 
page fault)
Merging sound-current/for-linus (b72f936f6b32 ALSA: hda/realtek: Fix mic issue 
on Acer AIO Veriton Z4860G/Z6860G)
Merging sound-asoc-fixes/for-linus (cc5dcb7578f8 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (0b35c52dfacf Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (92e932e6ff58 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (b07b864ee423 Revert "PCI/ASPM: Do not initialize 
link state when aspm_disabled is set")
Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5)
Merging tty.current/tty-linus (100bc3e2bebf tty: serial: 8250

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

2018-12-05 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  fs/btrfs/extent_io.c

between commit:

  e42c38c80535 ("btrfs: Refactor main loop in extent_readpages")

from the btrfs-kdave tree and commit:

  "fs: don't open code lru_to_page()"

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 fs/btrfs/extent_io.c
index 5104714212b4,3707c95a6598..
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -4103,24 -4103,28 +4103,24 @@@ int extent_readpages(struct address_spa
int nr = 0;
u64 prev_em_start = (u64)-1;
  
 -  for (page_idx = 0; page_idx < nr_pages; page_idx++) {
 -  page = lru_to_page(pages);
 +  while (!list_empty(pages)) {
 +  for (nr = 0; nr < BTRFS_PAGES_BATCH && !list_empty(pages);) {
-   struct page *page = list_entry(pages->prev, struct 
page, lru);
++  struct page *page = lru_to_page(pages);
  
 -  prefetchw(>flags);
 -  list_del(>lru);
 -  if (add_to_page_cache_lru(page, mapping,
 -  page->index,
 -  readahead_gfp_mask(mapping))) {
 -  put_page(page);
 -  continue;
 +  prefetchw(>flags);
 +  list_del(>lru);
 +  if (add_to_page_cache_lru(page, mapping, page->index,
 +  readahead_gfp_mask(mapping))) {
 +  put_page(page);
 +  continue;
 +  }
 +
 +  pagepool[nr++] = page;
}
  
 -  pagepool[nr++] = page;
 -  if (nr < ARRAY_SIZE(pagepool))
 -  continue;
__extent_readpages(tree, pagepool, nr, _cached, ,
 -  _flags, _em_start);
 -  nr = 0;
 + _flags, _em_start);
}
 -  if (nr)
 -  __extent_readpages(tree, pagepool, nr, _cached, ,
 -  _flags, _em_start);
  
if (em_cached)
free_extent_map(em_cached);


pgpc9BWdhrBG6.pgp
Description: OpenPGP digital signature


linux-next: build failure after merge of the device-mapper tree

2018-12-05 Thread Stephen Rothwell
   ^
include/linux/percpu-defs.h:263:47: note: in expansion of macro 
'VERIFY_PERCPU_PTR'
 #define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
   ^
block/genhd.c:86:17: note: in expansion of macro 'per_cpu_ptr'
 local_read(_cpu_ptr(part->dkstats, cpu)->in_flight[1]);
 ^~~
block/genhd.c: In function 'part_in_flight_rw':
include/linux/percpu-defs.h:219:52: error: invalid operands to binary + (have 
'struct disk_stats' and 'int')
  const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL; \
  ~ ^
include/asm-generic/local.h:29:42: note: in definition of macro 'local_read'
 #define local_read(l) atomic_long_read(&(l)->a)
  ^
include/linux/percpu-defs.h:259:2: note: in expansion of macro 
'__verify_pcpu_ptr'
  __verify_pcpu_ptr(__p);  \
  ^
include/linux/percpu-defs.h:263:47: note: in expansion of macro 
'VERIFY_PERCPU_PTR'
 #define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
   ^
block/genhd.c:107:30: note: in expansion of macro 'per_cpu_ptr'
   inflight[0] += local_read(_cpu_ptr(part->dkstats, cpu)->in_flight[0]);
  ^~~
include/linux/percpu-defs.h:260:10: error: invalid type argument of unary '*' 
(have 'struct disk_stats')
  (typeof(*(__p)) __kernel __force *)(__p);   \
  ^~
include/asm-generic/local.h:29:42: note: in definition of macro 'local_read'
 #define local_read(l) atomic_long_read(&(l)->a)
  ^
include/linux/percpu-defs.h:263:47: note: in expansion of macro 
'VERIFY_PERCPU_PTR'
 #define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
   ^
block/genhd.c:107:30: note: in expansion of macro 'per_cpu_ptr'
   inflight[0] += local_read(_cpu_ptr(part->dkstats, cpu)->in_flight[0]);
  ^~~
include/linux/percpu-defs.h:219:52: error: invalid operands to binary + (have 
'struct disk_stats' and 'int')
  const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL; \
  ~ ^
include/asm-generic/local.h:29:42: note: in definition of macro 'local_read'
 #define local_read(l) atomic_long_read(&(l)->a)
  ^
include/linux/percpu-defs.h:259:2: note: in expansion of macro 
'__verify_pcpu_ptr'
  __verify_pcpu_ptr(__p);  \
  ^
include/linux/percpu-defs.h:263:47: note: in expansion of macro 
'VERIFY_PERCPU_PTR'
 #define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
   ^
block/genhd.c:108:30: note: in expansion of macro 'per_cpu_ptr'
   inflight[1] += local_read(_cpu_ptr(part->dkstats, cpu)->in_flight[1]);
  ^~~
include/linux/percpu-defs.h:260:10: error: invalid type argument of unary '*' 
(have 'struct disk_stats')
  (typeof(*(__p)) __kernel __force *)(__p);   \
  ^~
include/asm-generic/local.h:29:42: note: in definition of macro 'local_read'
 #define local_read(l) atomic_long_read(&(l)->a)
  ^
include/linux/percpu-defs.h:263:47: note: in expansion of macro 
'VERIFY_PERCPU_PTR'
 #define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
   ^
block/genhd.c:108:30: note: in expansion of macro 'per_cpu_ptr'
   inflight[1] += local_read(_cpu_ptr(part->dkstats, cpu)->in_flight[1]);
  ^~~

Caused by commit

  3a657cf59109 ("block: switch to per-cpu in-flight counters")

This build does not have CONFIG_SMP set and part->dkstats is not a
pointer in this case.

I have reverted the device-mapper tree changes for today.
-- 
Cheers,
Stephen Rothwell


pgp679X9jLdSt.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the char-misc tree with the mmc tree

2018-12-05 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/misc/Makefile

between commit:

  4eb78924bf0e ("misc: cardreader: add new Alcor Micro Cardreader PCI driver")

from the mmc tree and commit:

  fcb418cd567f ("pvpanic: move pvpanic to misc as common driver")

from the char-misc 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/misc/Makefile
index fe3134cf3008,b76d611c87de..
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -57,4 -57,5 +57,5 @@@ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed
  obj-$(CONFIG_ASPEED_LPC_SNOOP)+= aspeed-lpc-snoop.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)   += pci_endpoint_test.o
  obj-$(CONFIG_OCXL)+= ocxl/
 -obj-$(CONFIG_MISC_RTSX)   += cardreader/
 +obj-y += cardreader/
+ obj-$(CONFIG_PVPANIC) += pvpanic.o


pgpHy3WpwG70j.pgp
Description: OpenPGP digital signature


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

2018-12-05 Thread Stephen Rothwell
Hi Guy,

On Wed, 5 Dec 2018 12:25:57 + "Guy Levi(SW)"  wrote:
>
> > 
> > Huh. So apparently every compiler that tested this patch (0-day, mine,
> > the submitters) optimized this call away because is_atomic_response()
> > always returns 0: meaning mlx5_get_atomic_laddr is never callable and
> > can be deleted entirely, including the call to mlx5_get_send_wqe.
> > 
> > Not sure what compiler setup will hit this, but it is clearly wrong
> > code..  
> 
> Flag -o0  ?

No, but the kbuild tree contains a change that allows turning off of
gcc's autoinlining and the CONFIG option guarding that gets turned on
for allmodconfig builds among others.

Masahiro, should CONFIG_NO_AUTO_INLINE maybe need to be off unless
explicitly enabled (like CONFIG_DEBUG_INFO and others)?

-- 
Cheers,
Stephen Rothwell


pgpA7kiOFqiyu.pgp
Description: OpenPGP digital signature


Re: Add Thunderbolt tree to linux-next

2018-12-05 Thread Stephen Rothwell
Hi Mika,

On Wed, 5 Dec 2018 13:37:36 +0200 Mika Westerberg 
 wrote:
>
> I maintain the Thunderbolt tree that gets merged to mainline via Greg's
> char-misc tree. I would like to get the tree included in linux-next to
> get wider coverage before it hits Greg's tree.
> 
> Can you please include branches 'fixes' and 'next' from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
> 
> in linux-next?

Added from today (well the fixes tree will be added tomorrow - but it
was empty anyway).

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 
s...@canb.auug.org.au


pgpGZ0X7ZPkjP.pgp
Description: OpenPGP digital signature


linux-next: Tree for Dec 5

2018-12-04 Thread Stephen Rothwell
Hi all,

Changes since 20181204:

The rdma tree still had its build failure so I used the version from
next-20181203.

The net-next tree gained a conflict against the net tree.

The mlx5-next tree gained a conflict against the rdma tree.

The akpm-current tree gained a build failure so I added a fix patch.

Non-merge commits (relative to Linus' tree): 6280
 6179 files changed, 301682 insertions(+), 168812 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (0072a0c14d5b Merge tag 'media/v4.20-4' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement 
reads{x}()/writes{x}())
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (ea2412dc21cc ACPI/IORT: Fix 
iort_get_platform_device_domain() uninitialized pointer value)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when 
setting up legacy consoles)
Merging sparc/master (f3f950dba37b Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (7b566f70e1bf phy: Revert toggling reset changes.)
Merging bpf/master (a92a72a24d48 Merge branch 'bpf-verifier-resilience')
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (4c05ec47384a netfilter: nf_tables: fix suspicious RCU 
usage in nft_chain_stats_replace())
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (37b06e507897 IB/mlx5: Fix implicit ODP interrupted 
page fault)
Merging sound-current/for-linus (5f8cf7125826 ALSA: usb-audio: Fix UAF 
decrement if card has no live interfaces in card.c)
Merging sound-asoc-fixes/for-linus (cc5dcb7578f8 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (0b35c52dfacf Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (92e932e6ff58 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (b07b864ee423 Revert "PCI/ASPM: Do not initialize 
link state when aspm_disabled is set")
Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5)
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag 
if console port)
Merging usb.current/usb-linus (2595646791c3 Linux 4.20-rc5)
Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of 
out transfers when DMA is used)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-fo

linux-next: build failure after merge of the akpm-current tree

2018-12-04 Thread Stephen Rothwell
Hi Andrew,

After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arm-linux-gnueabi-ld: kernel/sysctl.o: in function `.LANCHOR0':
sysctl.c:(.data+0x7b4): undefined reference to 
`fragment_stall_order_sysctl_handler'

Caused by commit

  a247ff3201c1 ("mm: stall movable allocations until kswapd progresses during 
serious external fragmentation event")

The fragment_stall_order_sysctl_handler() definition is protected by
CONFIG_NUMA, so I added this fix patch for today:

From: Stephen Rothwell 
Date: Wed, 5 Dec 2018 16:05:51 +1100
Subject: [PATCH] mm: fix for "stall movable allocations until kswapd
 progresses during serious external fragmentation event"

Signed-off-by: Stephen Rothwell 
---
 kernel/sysctl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 2f445c82fe38..93352cfb3239 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1487,6 +1487,7 @@ static struct ctl_table vm_table[] = {
.extra1 = ,
.extra2 = _thousand,
},
+#ifdef CONFIG_NUMA
{
.procname   = "fragment_stall_order",
.data   = _stall_order,
@@ -1496,6 +1497,7 @@ static struct ctl_table vm_table[] = {
.extra1 = ,
.extra2 = _order,
},
+#endif
{
.procname   = "percpu_pagelist_fraction",
.data   = _pagelist_fraction,
-- 
2.19.1

-- 
Cheers,
Stephen Rothwell


pgpQGTHZu3Gsy.pgp
Description: OpenPGP digital signature


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

2018-12-04 Thread Stephen Rothwell
Hi Doug,

On Tue, 04 Dec 2018 20:33:08 -0500 Doug Ledford  wrote:
>
> FWIW this will go away in a day or two.  I merged mlx5-next into rdma
> for-next in order to take a series that depended on it.

Understood, thanks.

-- 
Cheers,
Stephen Rothwell


pgpzySMSxk_jZ.pgp
Description: OpenPGP digital signature


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

2018-12-04 Thread Stephen Rothwell
Hi Leon,

Today's linux-next merge of the mlx5-next tree got a conflict in:

  drivers/infiniband/hw/mlx5/main.c
  drivers/infiniband/hw/mlx5/mlx5_ib.h

between commit:

  36e235c88299 ("RDMA/mlx5: Use the uapi disablement APIs instead of code")

from the rdma tree and commit:

  81773ce5f07f ("RDMA/mlx5: Use stages for callback to setup and release DEVX")

from the mlx5-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/infiniband/hw/mlx5/main.c
index f9078688da5b,96515a8c9d2c..
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@ -6231,6 -6336,12 +6321,9 @@@ static const struct mlx5_ib_profile pf_
STAGE_CREATE(MLX5_IB_STAGE_PRE_IB_REG_UMR,
 NULL,
 mlx5_ib_stage_pre_ib_reg_umr_cleanup),
 -  STAGE_CREATE(MLX5_IB_STAGE_SPECS,
 -   mlx5_ib_stage_populate_specs,
 -   NULL),
+   STAGE_CREATE(MLX5_IB_STAGE_WHITELIST_UID,
+mlx5_ib_stage_devx_init,
+mlx5_ib_stage_devx_cleanup),
STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
 mlx5_ib_stage_ib_reg_init,
 mlx5_ib_stage_ib_reg_cleanup),
diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
index a2b35a1a5031,861b68f2e330..
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@@ -781,6 -784,8 +784,7 @@@ enum mlx5_ib_stages 
MLX5_IB_STAGE_UAR,
MLX5_IB_STAGE_BFREG,
MLX5_IB_STAGE_PRE_IB_REG_UMR,
 -  MLX5_IB_STAGE_SPECS,
+   MLX5_IB_STAGE_WHITELIST_UID,
MLX5_IB_STAGE_IB_REG,
MLX5_IB_STAGE_POST_IB_REG_UMR,
MLX5_IB_STAGE_DELAY_DROP,
@@@ -890,7 -896,9 +895,8 @@@ struct mlx5_ib_pf_eq 
  
  struct mlx5_ib_dev {
struct ib_deviceib_dev;
 -  const struct uverbs_object_tree_def *driver_trees[7];
struct mlx5_core_dev*mdev;
+   struct notifier_block   mdev_events;
struct mlx5_roceroce[MLX5_MAX_PORTS];
int num_ports;
/* serialize update of capability mask


pgpemp0N7k62R.pgp
Description: OpenPGP digital signature


Re: mmotm 2018-12-04-16-00 uploaded

2018-12-04 Thread Stephen Rothwell
Hi Andrew,

On Tue, 04 Dec 2018 16:00:59 -0800 a...@linux-foundation.org wrote:
>
> * async-remove-some-duplicated-includes.patch

This patch has the wrong subject line (mentions kernel/signal.c).

-- 
Cheers,
Stephen Rothwell


pgpPHuutUVYku.pgp
Description: OpenPGP digital signature


linux-next: Tree for Dec 4

2018-12-03 Thread Stephen Rothwell
Hi all,

Changes since 20181203:

The rdma tree gained a build failure so I used the version from
next-20181203.

The bpf-next tree gained conflicts against the bpf tree.

The char-misc tree gained a conflict against the char-misc.current tree.

The akpm tree lost its build failure but gained a conflict against the
pm tree.

Non-merge commits (relative to Linus' tree): 5958
 6050 files changed, 291311 insertions(+), 163581 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (0072a0c14d5b Merge tag 'media/v4.20-4' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement 
reads{x}()/writes{x}())
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (ea2412dc21cc ACPI/IORT: Fix 
iort_get_platform_device_domain() uninitialized pointer value)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when 
setting up legacy consoles)
Merging sparc/master (f3f950dba37b Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (35b827b6d061 tun: forbid iface creation with rtnl ops)
Merging bpf/master (dcb40590e69e bpf: refactor bpf_test_run() to separate own 
failures and test program result)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (d78a5ebd8b18 Merge branch '1GbE' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (7bca603a69c0 RDMA/mlx5: Initialize return variable 
in case pagefault was skipped)
Merging sound-current/for-linus (5f8cf7125826 ALSA: usb-audio: Fix UAF 
decrement if card has no live interfaces in card.c)
Merging sound-asoc-fixes/for-linus (280ea4299e05 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (fea4962497d8 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (9ea83d4c2b9a Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (c74eadf881ad Merge remote-tracking branch 
'lorenzo/pci/controller-fixes' into for-linus)
Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5)
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag 
if console port)
Merging usb.current/usb-linus (2595646791c3 Linux 4.20-rc5)
Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of 
out transfers when DMA is used)
Merging usb-serial

linux-next: manual merge of the akpm tree with the pm tree

2018-12-03 Thread Stephen Rothwell
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

  fs/exec.c

between commit:

  67fe1224adc5 ("Revert "exec: make de_thread() freezable"")

from the pm tree and patch:

  "fs/: remove caller signal_pending branch predictions"

from the akpm 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 fs/exec.c
index ea7d439cf79e,044e296f2381..
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -1086,8 -1087,8 +1086,8 @@@ static int de_thread(struct task_struc
while (sig->notify_count) {
__set_current_state(TASK_KILLABLE);
spin_unlock_irq(lock);
 -  freezable_schedule();
 +  schedule();
-   if (unlikely(__fatal_signal_pending(tsk)))
+   if (__fatal_signal_pending(tsk))
goto killed;
spin_lock_irq(lock);
}
@@@ -1114,8 -1115,8 +1114,8 @@@
__set_current_state(TASK_KILLABLE);
write_unlock_irq(_lock);
cgroup_threadgroup_change_end(tsk);
 -  freezable_schedule();
 +  schedule();
-   if (unlikely(__fatal_signal_pending(tsk)))
+   if (__fatal_signal_pending(tsk))
goto killed;
}
  


pgpyJkxHzU7jW.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the char-misc tree with the char-misc.current tree

2018-12-03 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/hv/channel_mgmt.c

between commit:

  37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two 
workqueues")

from the char-misc.current tree and commit:

  4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API 
vmbus_get_outgoing_channel()")

from the char-misc tree.

I fixed it up (I used the former version where they conflicted) 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


pgp0vh8f1ZmPD.pgp
Description: OpenPGP digital signature


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

2018-12-03 Thread Stephen Rothwell
Hi all,

After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "mlx5_get_send_wqe" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] undefined!

Caused by commit

  34f4c9554d8b ("IB/mlx5: Use fragmented QP's buffer for in-kernel users")

mlx5_get_send_wqe() is still used in drivers/infiniband/hw/mlx5/cq.c
and declared in drivers/infiniband/hw/mlx5/mlx5_ib.h ...

I have used the version of the rdma tree from next-20181203 for today.



-- 
Cheers,
Stephen Rothwell


pgpro9F8bJwU6.pgp
Description: OpenPGP digital signature


Re: linux-next: error when trying to fetch the mediatek tree

2018-12-03 Thread Stephen Rothwell
Hi Matthias,

On Mon, 3 Dec 2018 22:07:07 +0100 Matthias Brugger  
wrote:
>
> I pushed and deleted the branch yesterday, as it does not build ATM.
> I'll fix that tomorrow.

No worries.

-- 
Cheers,
Stephen Rothwell


pgpkQCNqVFvM_.pgp
Description: OpenPGP digital signature


linux-next: error when trying to fetch the mediatek tree

2018-12-03 Thread Stephen Rothwell
Hi Matthias,

Fetching the mediatek tree
(git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git
branch for-next) produces this error:

fatal: Couldn't find remote ref refs/heads/for-next

-- 
Cheers,
Stephen Rothwell


pgpLiBBZA05RL.pgp
Description: OpenPGP digital signature


linux-next: Tree for Dec 3

2018-12-02 Thread Stephen Rothwell
Hi all,

Changes since 20181130:

The arm-soc tree gained a conflict against the kbuild tree.

The reset tree gained a conflict against the arm-soc tree.

The clk tree lost its build failure.

The vfs tree gained a conflict against the fscrypt tree.

The net-next tree gained conflicts against the net and bpf trees.

The akpm tree still had its build failure so I added another fix patch.

Non-merge commits (relative to Linus' tree): 5737
 5828 files changed, 283447 insertions(+), 161618 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (6a512726090a Merge tag 'armsoc-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (8d6237bb5d27 kbuild: fix UML build error with 
CONFIG_GCC_PLUGINS)
Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement 
reads{x}()/writes{x}())
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (ea2412dc21cc ACPI/IORT: Fix 
iort_get_platform_device_domain() uninitialized pointer value)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when 
setting up legacy consoles)
Merging sparc/master (e399ef194171 sparc32: supress another 
implicit-fallthrough warning)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (35b827b6d061 tun: forbid iface creation with rtnl ops)
Merging bpf/master (dcb40590e69e bpf: refactor bpf_test_run() to separate own 
failures and test program result)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (d78a5ebd8b18 Merge branch '1GbE' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (7bca603a69c0 RDMA/mlx5: Initialize return variable 
in case pagefault was skipped)
Merging sound-current/for-linus (5363857b916c ALSA: pcm: Fix interval 
evaluation with openmin/max)
Merging sound-asoc-fixes/for-linus (b586eb05a2b8 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (af4d024d23b5 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (5377ce14c76a Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (c74eadf881ad Merge remote-tracking branch 
'lorenzo/pci/controller-fixes' into for-linus)
Merging driver-core.current/driver-core-linus (d8f190ee836a Merge branch 'akpm' 
(patches from Andrew))
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag 
if console port)
Merging usb.current/usb-linus (d8f190ee836a Merge branch 'akpm' (patches from 
Andrew))

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

2018-12-02 Thread Stephen Rothwell
Hi Andrew,

After merging the akpm tree, today's linux-next build (powerpc_le perf)
failed like this:

bench/numa.c:37:10: fatal error: linux/numa.h: No such file or directory
 #include 
  ^~

Caused by patches

  "mm: replace all open encodings for NUMA_NO_NODE"
  "mm-replace-all-open-encodings-for-numa_no_node-fix"

For linux/numa.h to be generally availble to the tools builds, it must
be copied into tools/include/linux ...

I have done that copy for today:

From 6dabc11d5513510d0ec0a6b0a4aa8b9051b71516 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell 
Date: Mon, 3 Dec 2018 17:57:27 +1100
Subject: [PATCH] linux/numa.h is now needed for the perf build

Signed-off-by: Stephen Rothwell 
---
 tools/include/linux/numa.h | 16 
 1 file changed, 16 insertions(+)
 create mode 100644 tools/include/linux/numa.h

diff --git a/tools/include/linux/numa.h b/tools/include/linux/numa.h
new file mode 100644
index ..110b0e5d0fb0
--- /dev/null
+++ b/tools/include/linux/numa.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_NUMA_H
+#define _LINUX_NUMA_H
+
+
+#ifdef CONFIG_NODES_SHIFT
+#define NODES_SHIFT CONFIG_NODES_SHIFT
+#else
+#define NODES_SHIFT 0
+#endif
+
+#define MAX_NUMNODES(1 << NODES_SHIFT)
+
+#defineNUMA_NO_NODE(-1)
+
+#endif /* _LINUX_NUMA_H */
-- 
2.19.1

-- 
Cheers,
Stephen Rothwell


pgp_cz06gl83p.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the vfs tree with the fscrypt tree

2018-12-02 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  include/linux/fs.h

between commit:

  a2bd7d2fc32c ("fs-verity: add setup code, UAPI, and Kconfig")

from the fscrypt tree and commit:

  37744f3d21f8 ("vfs: Implement a filesystem superblock creation/configuration 
context")
  d5ab33dfd7bc ("vfs: syscall: Add fsinfo() to query filesystem information")

from the vfs 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 d7bf524a0517,aae0aec1adb4..
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -62,8 -61,10 +62,12 @@@ struct workqueue_struct
  struct iov_iter;
  struct fscrypt_info;
  struct fscrypt_operations;
 +struct fsverity_info;
 +struct fsverity_operations;
+ struct fs_context;
+ struct fs_parameter_description;
+ struct fsinfo_kparams;
+ enum fsinfo_attribute;
  
  extern void __init inode_init(void);
  extern void __init inode_init_early(void);


pgpX1ZZJRwcKe.pgp
Description: OpenPGP digital signature


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

2018-12-02 Thread Stephen Rothwell
Hi Philipp,

Today's linux-next merge of the reset tree got a conflict in:

  arch/arm/mach-socfpga/socfpga.c

between commit:

  8f6f8c77fc4d ("reset: socfpga: add an early reset driver for SoCFPGA")

from the arm-soc tree and commit:

  48e2bab90d8e ("ARM: socfpga: Clean unused functions")

from the reset tree.

Note that it is generally a bad idea to declare extern functions in c
files ... the declaration should be in some header file that is included
by the files containing the definition and usage.  That would
have also removed the need for the forward declaration in
drivers/reset/reset-socfpga.c.

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/arm/mach-socfpga/socfpga.c
index 5fb6f79059a8,cc64576c102b..
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@@ -32,7 -32,9 +32,9 @@@ void __iomem *rst_manager_base_addr
  void __iomem *sdr_ctl_base_addr;
  unsigned long socfpga_cpu1start_addr;
  
+ extern void __init socfpga_reset_init(void);
+ 
 -void __init socfpga_sysmgr_init(void)
 +static void __init socfpga_sysmgr_init(void)
  {
struct device_node *np;
  


pgpPuMRUd1QrO.pgp
Description: OpenPGP digital signature


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

2018-12-02 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in:

  arch/arm/mach-socfpga/Kconfig

between commit:

  2eac9c2dfb2b ("PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC 
config options")

from the kbuild tree and commit:

  fbc125afdc50 ("ARM: socfpga: Turn on ARM errata for L2 cache")

from the arm-soc tree.

I fixed it up (see below - I also resorted the select lines since they
seemed to be so before the former latter commit) 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/arm/mach-socfpga/Kconfig
index d43798defdba,a04660918d71..
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@@ -3,6 -3,6 +3,9 @@@ menuconfig ARCH_SOCFPG
depends on ARCH_MULTI_V7
select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA
++  select ARM_ERRATA_754322
++  select ARM_ERRATA_764369 if SMP
++  select ARM_ERRATA_775420
select ARM_GIC
select CACHE_L2X0
select DW_APB_TIMER_OF
@@@ -10,7 -10,14 +13,11 @@@
select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP
select MFD_SYSCON
 -  select PCI_DOMAINS if PCI
 -  select ARM_ERRATA_754322
 -  select ARM_ERRATA_764369 if SMP
 -  select ARM_ERRATA_775420
 +  select PCI_DOMAINS_GENERIC if PCI
+   select PL310_ERRATA_588369
+   select PL310_ERRATA_727915
+   select PL310_ERRATA_753970 if PL310
+   select PL310_ERRATA_769419
  
  if ARCH_SOCFPGA
  config SOCFPGA_SUSPEND


pgpRCbjV5Z1Yp.pgp
Description: OpenPGP digital signature


linux-next: Signed-off-by missing for commit in the drm-msm tree

2018-12-02 Thread Stephen Rothwell
Hi Rob,

Commit

  a288ee6eb8d0 ("drm/msm: validate display and event threads")

is missing a Signed-off-by from its committer.

-- 
Cheers,
Stephen Rothwell


pgpBbmV9joR9Y.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 30

2018-11-29 Thread Stephen Rothwell
Hi all,

Changes since 20181129:

The clk tree gained a build failure so I used the version from
next-20181129.

The akpm tree gained a build failure for which I applied a partial
revert patch.

Non-merge commits (relative to Linus' tree): 5706
 5781 files changed, 274209 insertions(+), 160066 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (60b548237fed Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (595c647d341e sparc: suppress the implicit-fallthrough 
warnings)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (bf360f3b799f ARC: change defconfig defaults to 
ARCv2)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (874bfc6e5422 arm64: ftrace: Fix to enable 
syscall events on arm64)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (462951cd32e1 powerpc/mm: Fix linux page tables 
build with some configs)
Merging sparc/master (e399ef194171 sparc32: supress another 
implicit-fallthrough warning)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (e869e7b59906 Merge branch 'xps-fixes')
Merging bpf/master (528bff0cdb66 tools: bpftool: fix a bitfield pretty print 
issue)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (d78a5ebd8b18 Merge branch '1GbE' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (75b7b86bdb0d IB/mlx5: Fix page fault handling for MW)
Merging sound-current/for-linus (5363857b916c ALSA: pcm: Fix interval 
evaluation with openmin/max)
Merging sound-asoc-fixes/for-linus (b586eb05a2b8 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (af4d024d23b5 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (5377ce14c76a Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (0e62205ca505 Merge remote-tracking branch 
'lorenzo/pci/controller-fixes' into for-linus)
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag 
if console port)
Merging usb.current/usb-linus (effd14f66cc1 usb: core: quirks: add RESET_RESUME 
quirk for Cherry G230 Stream series)
Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of 
out transfers when DMA is used)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRI

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

2018-11-29 Thread Stephen Rothwell
Hi Andrew,

After merging the akpm tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

lib/lzo/lzo1x_compress.c: In function 'lzo1x_1_do_compress':
lib/lzo/lzo1x_compress.c:239:14: warning: 'm_pos' may be used uninitialized in 
this function [-Wmaybe-uninitialized]
   m_off = ip - m_pos;
   ~~~^~~
Probably introduced by patch

  "lib/lzo: implement run-length encoding"
or
  "lib/lzo: separate lzo-rle from lzo"

-- 
Cheers,
Stephen Rothwell


pgpvl_4ETKZoU.pgp
Description: OpenPGP digital signature


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

2018-11-29 Thread Stephen Rothwell
Hi Andrew,

After merging the akpm tree, today's linux-next build (powerpc_le perf)
failed like this:

bench/numa.c: In function 'bind_to_node':
bench/numa.c:301:21: error: 'NUMA_NO_NODE' undeclared (first use in this 
function); did you mean 'NUMA_NUM_NODES'?
  if (target_node == NUMA_NO_NODE) {
 ^~~~
 NUMA_NUM_NODES
bench/numa.c:301:21: note: each undeclared identifier is reported only once for 
each function it appears in
bench/numa.c: In function 'bind_to_memnode':
bench/numa.c:342:14: error: 'NUMA_NO_NODE' undeclared (first use in this 
function); did you mean 'NUMA_NUM_NODES'?
  if (node == NUMA_NO_NODE)
  ^~~~
  NUMA_NUM_NODES
bench/numa.c: In function 'init_thread_data':
bench/numa.c:1366:19: error: 'NUMA_NO_NODE' undeclared (first use in this 
function); did you mean 'NUMA_NUM_NODES'?
   td->bind_node = NUMA_NO_NODE;
   ^~~~
   NUMA_NUM_NODES

Caused by patch

  "mm: replace all open encodings for NUMA_NO_NODE"

I applied the following partial revert for today:

From 765f2fd3d18ca1d4d0783b888d127af784929e3e Mon Sep 17 00:00:00 2001
From: Stephen Rothwell 
Date: Fri, 30 Nov 2018 16:26:32 +1100
Subject: [PATCH] partial revert (perf) of "mm: replace all open encodings for 
NUMA_NO_NODE"

Signed-off-by: Stephen Rothwell 
---
 tools/perf/bench/numa.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
index e0ad5f1de226..44195514b19e 100644
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@ -298,7 +298,7 @@ static cpu_set_t bind_to_node(int target_node)
 
CPU_ZERO();
 
-   if (target_node == NUMA_NO_NODE) {
+   if (target_node == -1) {
for (cpu = 0; cpu < g->p.nr_cpus; cpu++)
CPU_SET(cpu, );
} else {
@@ -339,7 +339,7 @@ static void bind_to_memnode(int node)
unsigned long nodemask;
int ret;
 
-   if (node == NUMA_NO_NODE)
+   if (node == -1)
return;
 
BUG_ON(g->p.nr_nodes > (int)sizeof(nodemask)*8);
@@ -1363,7 +1363,7 @@ static void init_thread_data(void)
int cpu;
 
/* Allow all nodes by default: */
-   td->bind_node = NUMA_NO_NODE;
+   td->bind_node = -1;
 
/* Allow all CPUs by default: */
CPU_ZERO(>bind_cpumask);
-- 
2.19.1

-- 
Cheers,
Stephen Rothwell


pgpsjyYWnF5m0.pgp
Description: OpenPGP digital signature


Re: linux-next: build warning after merge of the qcom tree

2018-11-29 Thread Stephen Rothwell
Hi Stephen,

On Thu, 29 Nov 2018 08:30:48 -0800 Stephen Boyd  wrote:
>
> Andy's email isn't at codeaurora.org anymore. Not sure if that matters
> but he may be missing this.

I have updated my contacts list, thanks.

-- 
Cheers,
Stephen Rothwell


pgpMievFVKGCC.pgp
Description: OpenPGP digital signature


Re: [PATCH] drm: msm: Check cmd_db_read_aux_data() for failure

2018-11-29 Thread Stephen Rothwell
Hi Andy,

On Thu, 29 Nov 2018 16:42:34 -0600 Andy Gross  wrote:
>
> On Thu, Nov 29, 2018 at 04:36:00PM -0600, Andy Gross wrote:
> > On Thu, Nov 29, 2018 at 08:38:26AM -0800, Stephen Boyd wrote:  
> > > We need to check the call to cmd_db_read_aux_data() for the error case,
> > > so that we don't continue and use potentially uninitialized values for
> > > 'pri_count' and 'sec_count'. Otherwise, we get the following compiler
> > > warnings:
> > > 
> > >drivers/gpu/drm/msm/adreno/a6xx_gmu.c: In function 
> > > 'a6xx_gmu_rpmh_arc_votes_init.isra.12':
> > >drivers/gpu/drm/msm/adreno/a6xx_gmu.c:943:12: warning: 'pri_count' is 
> > > used uninitialized in this function [-Wuninitialized]
> > >  pri_count >>= 1;
> > >^~~
> > >drivers/gpu/drm/msm/adreno/a6xx_gmu.c:948:12: warning: 'sec_count' may 
> > > be used uninitialized in this function
> > > [-Wmaybe-uninitialized]
> > >  sec_count >>= 1;
> > >^~~
> > > 
> > > Reported-by: Stephen Rothwell 
> > > Reported-by: kbuild test robot 
> > > Cc: Jordan Crouse 
> > > Cc: Bjorn Andersson 
> > > Cc: Evan Green 
> > > Cc: Jordan Crouse 
> > > Cc: Rob Clark 
> > > Fixes: ed3cafa79ea7 ("soc: qcom: cmd-db: Stop memcpy()ing in 
> > > cmd_db_read_aux_data()")
> > > Signed-off-by: Stephen Boyd   
> 
> On second thought, this needs to go through drm tree.

Why?  The commit that introduces the warnings is only in the qcom
tree ...


-- 
Cheers,
Stephen Rothwell


pgpt87y3HfDqJ.pgp
Description: OpenPGP digital signature


Re: [PATCH] clk: imx: Use do_div in SCCG due to 64-bit divisor

2018-11-29 Thread Stephen Rothwell
Hi Abel,

On Thu, 29 Nov 2018 23:50:22 + Abel Vesa  wrote:
>
> --- a/drivers/clk/imx/clk-frac-pll.c
> +++ b/drivers/clk/imx/clk-frac-pll.c
> @@ -116,12 +116,13 @@ static long clk_pll_round_rate(struct clk_hw *hw, 
> unsigned long rate,
>  unsigned long *prate)
>  {
>   u64 parent_rate = *prate;
> - u32 divff, divfi;
> - u64 temp64;
> + u64 divff, divfi;
> + u64 temp64 = rate;
>  
>   parent_rate *= 8;
>   rate *= 2;
> - divfi = rate / parent_rate;
> + do_div(temp64, parent_rate);
> + divfi = temp64;

Did you mean to lose the doubling of "rate" above?

-- 
Cheers,
Stephen Rothwell


pgpzWIcxKyq2X.pgp
Description: OpenPGP digital signature


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

2018-11-29 Thread Stephen Rothwell
Hi all,

After merging the clk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arm-linux-gnueabi-ld: drivers/clk/imx/clk-frac-pll.o: in function 
`clk_pll_round_rate':
clk-frac-pll.c:(.text+0x50): undefined reference to `__aeabi_uldivmod'

Caused by commit

  9fd680d0fafd ("clk: imx: add fractional PLL output clock")

I have used the clk tree from next-20181129 for today.

-- 
Cheers,
Stephen Rothwell


pgpmqRfPkAgc5.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 29

2018-11-28 Thread Stephen Rothwell
Hi all,

Changes since 20181128:

Non-merge commits (relative to Linus' tree): 5335
 5517 files changed, 266627 insertions(+), 155239 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (121b018f8c74 Merge tag 'for-4.20-rc4-tag' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/master (595c647d341e sparc: suppress the implicit-fallthrough 
warnings)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (bf360f3b799f ARC: change defconfig defaults to 
ARCv2)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (4f9f49646a57 arm64: cpufeature: Fix 
mismerge of CONFIG_ARM64_SSBD block)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (462951cd32e1 powerpc/mm: Fix linux page tables 
build with some configs)
Merging sparc/master (e399ef194171 sparc32: supress another 
implicit-fallthrough warning)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (d78a5ebd8b18 Merge branch '1GbE' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue)
Merging bpf/master (0d32f17717e6 sctp: increase sk_wmem_alloc when 
head->truesize is increased)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (ca08987885a1 netfilter: nf_tables: deactivate 
expressions in rule replecement routine)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (75b7b86bdb0d IB/mlx5: Fix page fault handling for MW)
Merging sound-current/for-linus (8159a6a4a7d2 ALSA: usb-audio: Add vendor and 
product name for Dell WD19 Dock)
Merging sound-asoc-fixes/for-linus (64d358d9843b Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (af4d024d23b5 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (35bf20e73a0b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (0e62205ca505 Merge remote-tracking branch 
'lorenzo/pci/controller-fixes' into for-linus)
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag 
if console port)
Merging usb.current/usb-linus (effd14f66cc1 usb: core: quirks: add RESET_RESUME 
quirk for Cherry G230 Stream series)
Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of 
out transfers when DMA is used)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with 
fused value for SDM845)
Merging stagin

Re: linux-next: build warning after merge of the qcom tree

2018-11-28 Thread Stephen Rothwell
Hi all,

On Fri, 16 Nov 2018 10:10:59 +1100 Stephen Rothwell  
wrote:
>
> Hi all,
> 
> After merging the qcom tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
> 
> drivers/gpu/drm/msm/adreno/a6xx_gmu.c: In function 
> 'a6xx_gmu_rpmh_arc_votes_init.constprop':
> drivers/gpu/drm/msm/adreno/a6xx_gmu.c:943:12: warning: 'pri_count' is used 
> uninitialized in this function [-Wuninitialized]
>   pri_count >>= 1;
> ^~~
> drivers/gpu/drm/msm/adreno/a6xx_gmu.c:948:12: warning: 'sec_count' may be 
> used uninitialized in this function [-Wmaybe-uninitialized]
>   sec_count >>= 1;
> ^~~
> 
> Introduced by commit
> 
>   ed3cafa79ea7 ("soc: qcom: cmd-db: Stop memcpy()ing in 
> cmd_db_read_aux_data()")
> 
> # CONFIG_QCOM_COMMAND_DB is not set

I am still getting these warnings.

-- 
Cheers,
Stephen Rothwell


pgpgFSdSEwhU5.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 28

2018-11-27 Thread Stephen Rothwell
Hi all,

Changes since 20181127:

The vfs tree gained a conflict against the ext3 tree.

Non-merge commits (relative to Linus' tree): 5084
 5241 files changed, 259238 insertions(+), 151877 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (ef78e5ec9214 ia64: export node_distance function)
Merging fixes/master (595c647d341e sparc: suppress the implicit-fallthrough 
warnings)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (6b04114f6fae arc: [devboards] Add support of 
NFSv3 ACL)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (4f9f49646a57 arm64: cpufeature: Fix 
mismerge of CONFIG_ARM64_SSBD block)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (93143f846b27 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging bpf/master (2b9034b5eadd sparc: Adjust bpf JIT prologue for PSEUDO 
calls.)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on 
acquire)
Merging netfilter/master (53ca0f2fec39 netfilter: nf_conncount: remove wrong 
condition check routine)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (75b7b86bdb0d IB/mlx5: Fix page fault handling for MW)
Merging sound-current/for-linus (b8e0be79d000 Merge tag 'asoc-v4.20-rc4' of 
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (8f47ccdd70fd Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (84f59cf6d5fc Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (0ca420a3bddf Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (94ea01a6d9a6 PCI: Fix incorrect value returned 
from pcie_get_speed_cap())
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag 
if console port)
Merging usb.current/usb-linus (effd14f66cc1 usb: core: quirks: add RESET_RESUME 
quirk for Cherry G230 Stream series)
Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of 
out transfers when DMA is used)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with 
fused value for SDM845)
Merging staging.current/staging-linus (c648284f6c96 M

Re: linux-next: Tree for Nov 27 (scsi/aha1542)

2018-11-27 Thread Stephen Rothwell
Hi all,

On Tue, 27 Nov 2018 20:14:58 -0800 Randy Dunlap  wrote:
>
> On 11/26/18 8:25 PM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since 20181126:
> >   
> 
> on i386:
> 
> ERROR: "__udivdi3" [drivers/scsi/aha1542.ko] undefined!
> 
> somewhere in aha1542_interrupt() according to objdump.

Presumably caused by commit

  1794ef2b150d ("scsi: aha1542: convert to DMA mapping API")

-- 
Cheers,
Stephen Rothwell


pgpgKdyluUPkw.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the vfs tree with the ext3 tree

2018-11-27 Thread Stephen Rothwell
Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/Makefile

between commit:

  d44170a7ba48 ("fs: common implementation of file type")

from the ext3 tree and commits:

  229e55402816 ("vfs: Add configuration parser helpers")
  37744f3d21f8 ("vfs: Implement a filesystem superblock creation/configuration 
context")
  1d9c8fafbf6f ("vfs: syscall: Add fsopen() to prepare for superblock creation")

from the vfs 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 fs/Makefile
index 23fcd8c164a3,e3ea8093b178..
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -13,7 -13,7 +13,8 @@@ obj-y :=  open.o read_write.o file_table
seq_file.o xattr.o libfs.o fs-writeback.o \
pnode.o splice.o sync.o utimes.o d_path.o \
stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
 -  fs_context.o fs_parser.o fsopen.o
++  fs_context.o fs_parser.o fsopen.o \
 +  fs_types.o
  
  ifeq ($(CONFIG_BLOCK),y)
  obj-y +=  buffer.o block_dev.o direct-io.o mpage.o


pgpVWD4HAtRKM.pgp
Description: OpenPGP digital signature


Re: linux-next: Signed-off-by missing for commit in the kselftest tree

2018-11-27 Thread Stephen Rothwell
Hi Shuah,

On Tue, 27 Nov 2018 14:17:57 -0700 shuah  wrote:
>
> Thanks for catching this. I will fix it. This is the result of change 
> log content messing up the commit: The diff -Z in the change log 
> resulted in throwing out the Signed-off and Acked-by.

Tricky :-(

> -
> diff -Z is used to trim the trailing whitespace when comparing the
> loaded firmware file with the source firmware file. However, per the
> comment in the source code, -Z should not be necessary. In testing, the
> input and output files are identical.
> 
> Additionally, -Z is not a standard option and is not available in
> environments such as busybox. When -Z is not supported, diff fails with
> a usage error, which is suppressed, but then causes read_firmwares() to
> exit with a false failure message.
> 
> 
> Oh well! I will fix-up the change-log and amend the commit.

Thanks.

-- 
Cheers,
Stephen Rothwell


pgpym4n2KPrTw.pgp
Description: OpenPGP digital signature


linux-next: Signed-off-by missing for commit in the kselftest tree

2018-11-27 Thread Stephen Rothwell
Hi Shuah,

Commit

  623ea0df7083 ("selftests: firmware: remove use of non-standard diff -Z 
option")

is missing a Signed-off-by from its author.

-- 
Cheers,
Stephen Rothwell


pgp7ZaLoM8wMr.pgp
Description: OpenPGP digital signature


Re: linux-next: manual merge of the selinux tree with the vfs tree

2018-11-27 Thread Stephen Rothwell
Hi Ondrej,

On Tue, 27 Nov 2018 09:53:32 +0100 Ondrej Mosnacek  wrote:
>
> Hm... seems that there was some massive overhaul in the VFS code right
> at the wrong moment... There are new hooks for mounting now and the

The mount changes have been in linux-next since before the last
release ...

> code that our commit changes is now here:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/tree/security/selinux/hooks.c?h=for-next#n3131
> 
> It seems that the logic is still the same, just now our patch (or the
> VFS one) needs to be updated to change the above line as such
> (untested pseudo-patch):
> 
> - if (fc->purpose == FS_CONTEXT_FOR_KERNEL_MOUNT)
> + if (fc->purpose == (FS_CONTEXT_FOR_KERNEL_MOUNT|FS_CONTEXT_FOR_SUBMOUNT))

OK, so from tomorrow I will use that merge resolution.  Someone needs
to remember to tell Linus about this when the latter of the vfs and
selinux trees reach him.

Thanks for the better resolution.
-- 
Cheers,
Stephen Rothwell


pgp5dfD69opQI.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 27

2018-11-26 Thread Stephen Rothwell
Hi all,

Changes since 20181126:

The selinux tree gained a conflict against the vfs tree.

Non-merge commits (relative to Linus' tree): 4747
 4948 files changed, 246866 insertions(+), 147684 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (6f8b52ba442c Merge tag 'hwmon-for-v4.20-rc5' of 
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
Merging fixes/master (595c647d341e sparc: suppress the implicit-fallthrough 
warnings)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (6b04114f6fae arc: [devboards] Add support of 
NFSv3 ACL)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (4f9f49646a57 arm64: cpufeature: Fix 
mismerge of CONFIG_ARM64_SSBD block)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (69500127424c Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging bpf/master (69500127424c Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (89259088c1b7 netfilter: nfnetlink_cttimeout: fetch 
timeouts for udplite and gre, too)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (24c3456c8d5e iser: set sector for ambiguous mr 
status errors)
Merging sound-current/for-linus (c4cfcf6f4297 ALSA: hda/realtek - fix the pop 
noise on headphone for lenovo laptops)
Merging sound-asoc-fixes/for-linus (8f47ccdd70fd Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (84f59cf6d5fc Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (0ca420a3bddf Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (94ea01a6d9a6 PCI: Fix incorrect value returned 
from pcie_get_speed_cap())
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (effd14f66cc1 usb: core: quirks: add RESET_RESUME 
quirk for Cherry G230 Stream series)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type on unaligned transfers)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with 
fused value for SDM845)
Merging staging.current/staging-linus (c6

linux-next: manual merge of the selinux tree with the vfs tree

2018-11-26 Thread Stephen Rothwell
Hi Paul,

Today's linux-next merge of the selinux tree got a conflict in:

  security/selinux/hooks.c

between commit:

  0472421f47a9 ("vfs: Remove unused code after filesystem context changes")

from the vfs tree and commit:

  2cbdcb882f97 ("selinux: always allow mounting submounts")

from the selinux tree.

I fixed it up (the former removed the function updated by the latter -
I am not sure if there are further changes necessary) 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


pgpMN3SrTwzXU.pgp
Description: OpenPGP digital signature


Re: linux-next: build warning after merge of the f2fs tree

2018-11-26 Thread Stephen Rothwell
Hi Jaegeuk,

On Mon, 26 Nov 2018 14:22:57 -0800 Jaegeuk Kim  wrote:
>
> Is this okay?

That looks great, thanks.

> From: Jaegeuk Kim 
> Date: Mon, 26 Nov 2018 14:20:32 -0800
> Subject: [PATCH] f2fs: avoid build warn of fall_through
> 
> After merging the f2fs tree, today's linux-next build
>  (x86_64_allmodconfig) produced this warning:
> 
>  In file included from fs/f2fs/dir.c:11:
>  fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
>  fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through 
> [-Wimplicit-fallthrough=]
> if (set)
>^
>  fs/f2fs/f2fs.h:2390:2: note: here
>case FI_DATA_EXIST:
>^~~~
> 
>  Exposed by my use of -Wimplicit-fallthrough
> 
> Reported-by: Stephen Rothwell 
> Signed-off-by: Jaegeuk Kim 
> ---
>  fs/f2fs/f2fs.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 26ad1de8641c..b3fe6803d4c6 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -2387,6 +2387,7 @@ static inline void __mark_inode_dirty_flag(struct inode 
> *inode,
>   case FI_NEW_INODE:
>   if (set)
>   return;
> + /* fall through */
>   case FI_DATA_EXIST:
>   case FI_INLINE_DOTS:
>   case FI_PIN_FILE:
> -- 

-- 
Cheers,
Stephen Rothwell


pgpCNqkQFYi9u.pgp
Description: OpenPGP digital signature


Re: linux-next: build warning after merge of the f2fs tree

2018-11-26 Thread Stephen Rothwell
Hi Jaegeuk,

On Mon, 26 Nov 2018 13:59:24 -0800 Jaegeuk Kim  wrote:
>
> On 11/26, Stephen Rothwell wrote:
> > 
> > After merging the f2fs tree, today's linux-next build
> > (x86_64_allmodconfig) produced this warning:
> > 
> > In file included from fs/f2fs/dir.c:11:
> > fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
> > fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through 
> > [-Wimplicit-fallthrough=]
> >if (set)
> >   ^
> > fs/f2fs/f2fs.h:2390:2: note: here
> >   case FI_DATA_EXIST:
> >   ^~~~
> > 
> > Exposed by my use of -Wimplicit-fallthrough
> > 
> > I am not sure why this has turned up now (as opposed to earlier today).  
> 
> The above change had been there for a long time, as an intended behavior.

Yeah, it popped up due to line number changes in that file and the way
I was filtering new warnings.

> Hmm, I'm not sure how to avoid this.

if you add a comment
/* fall through */
at the point the fall through occurs, then the warning is suppressed
(and it documents that it is deliberate).

-- 
Cheers,
Stephen Rothwell


pgpKLH2A7Inzq.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 26

2018-11-26 Thread Stephen Rothwell
Hi all,

Changes since 20181123:

I am now building with the -Wimplicit-fallthrough gcc flag to help Kees
Cook prevent new such warnings from being added.

The mips-misc tree gained a conflict against the kbuild tree.

The drm tree gained a conflict against the drm-misc-fixes tree.

The etnaviv tree gained a conflict against the drm-misc tree.

The tip tree gained a conflict against the vfs tree.

Non-merge commits (relative to Linus' tree): 4655
 4896 files changed, 241327 insertions(+), 146539 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (d6d460b89378 Merge tag 'dma-mapping-4.20-3' of 
git://git.infradead.org/users/hch/dma-mapping)
Merging fixes/master (4d8360ade996 Check for new cases of implict fallthrough)
Applying: powerpc: tag implicit fall throughs
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (6b04114f6fae arc: [devboards] Add support of 
NFSv3 ACL)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (4f9f49646a57 arm64: cpufeature: Fix 
mismerge of CONFIG_ARM64_SSBD block)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (aba36930a35e net: always initialize pagedlen)
Merging bpf/master (1efb6ee3edea bpf: fix check of allowed specifiers in 
bpf_trace_printk)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (38d37baa8123 ipvs: call ip_vs_dst_notifier earlier 
than ipv6_dev_notf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (1770f0fa978e mt76: fix uninitialized mutex 
access setting rts threshold)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (24c3456c8d5e iser: set sector for ambiguous mr 
status errors)
Merging sound-current/for-linus (e1a7bfe38079 ALSA: control: Fix race between 
adding and removing a user element)
Merging sound-asoc-fixes/for-linus (0e37f0eb78f0 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (400dba3b3914 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (30373c19b907 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (edeca3a769ad Merge tag 'sound-4.20-rc4' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dw

Re: linux-next: build warnings after merge of the cifs tree

2018-11-25 Thread Stephen Rothwell
Hi Kees,

On Sun, 25 Nov 2018 21:48:10 -0800 Kees Cook  wrote:
>
> On Sun, Nov 25, 2018 at 4:52 PM Stephen Rothwell  
> wrote:
> >
> > On Sun, 25 Nov 2018 18:31:40 -0600 Steve French  wrote: 
> >  
> > >
> > > Both of those cases are intentional fallthroughs and there are
> > > existing comments in the code noting the reasons for them to
> > > fallthrough
> > >
> > > (also can see the reasoning for these in the commits which introduced
> > > them from Sachin c369c9a4a7c82) and dde2356c84662)  
> >
> > I am not questioning that :-)
> >
> > The gcc warning can be turned off by adding a /* fall through */
> > comment at the point the fall through happens.  Kees and others are
> > working on the several hundred other places that need annotating.  
> 
> Right. The goal is to avoid adding any _new_ cases of this. :)
> 
> > This one just popped up.  
> 
> It's already working! :) Thanks Stephen!

Actually this one was the product of how I filter out warnings ... it
was an old one, but the line numbers changed.   I have now started
ignoring these if just the line numbers change.

-- 
Cheers,
Stephen Rothwell


pgp8Wp7Wp03Zp.pgp
Description: OpenPGP digital signature


linux-next: build warning after merge of the slave-dma tree

2018-11-25 Thread Stephen Rothwell
Hi Vinod,

After merging the slave-dma tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

drivers/dma/coh901318.c: In function 'coh901318_config':
drivers/dma/coh901318.c:1805:16: warning: unused variable 'flags' 
[-Wunused-variable]
  unsigned long flags;
^

Introduced by commit

  627469e4445b ("dmaengine: coh901318: Fix a double-lock bug")

-- 
Cheers,
Stephen Rothwell


pgp_XvZgdKYFJ.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the tip tree with the vfs tree

2018-11-25 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/x86/kernel/cpu/resctrl/rdtgroup.c

between commit:

  16ec1a5d58ea ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
(where the file is arch/x86/kernel/cpu/intel_rdt_rdtgroup.c)

from the vfs tree and commit:

  580ebb66cbb3 ("x86/resctrl: Add vendor check for the MBA software controller")

from the tip 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/x86/kernel/cpu/resctrl/rdtgroup.c
index 37c0ccb50823,61b102dd51a5..
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@@ -2032,88 -2065,8 +2032,91 @@@ out
rdt_last_cmd_clear();
mutex_unlock(_mutex);
cpus_read_unlock();
 +  return ret;
 +}
 +
 +enum rdt_param {
 +  Opt_cdp,
 +  Opt_cdpl2,
 +  Opt_mba_mpbs,
 +  nr__rdt_params
 +};
  
 -  return dentry;
 +static const struct fs_parameter_spec rdt_param_specs[nr__rdt_params] = {
 +  [Opt_cdp]   = { fs_param_is_flag },
 +  [Opt_cdpl2] = { fs_param_is_flag },
 +  [Opt_mba_mpbs]  = { fs_param_is_flag },
 +};
 +
 +static const char *const rdt_param_keys[nr__rdt_params] = {
 +  [Opt_cdp]   = "cdp",
 +  [Opt_cdpl2] = "cdpl2",
 +  [Opt_mba_mpbs]  = "mba_mbps",
 +};
 +
 +static const struct fs_parameter_description rdt_fs_parameters = {
 +  .name   = "rdt",
 +  .nr_params  = nr__rdt_params,
 +  .keys   = rdt_param_keys,
 +  .specs  = rdt_param_specs,
 +  .no_source  = true,
 +};
 +
 +static int rdt_parse_param(struct fs_context *fc, struct fs_parameter *param)
 +{
 +  struct rdt_fs_context *ctx = rdt_fc2context(fc);
 +  struct fs_parse_result result;
 +  int opt;
 +
 +  opt = fs_parse(fc, _fs_parameters, param, );
 +  if (opt < 0)
 +  return opt;
 +
 +  switch (opt) {
 +  case Opt_cdp:
 +  ctx->enable_cdpl3 = true;
 +  return 0;
 +  case Opt_cdpl2:
 +  ctx->enable_cdpl2 = true;
 +  return 0;
 +  case Opt_mba_mpbs:
-   ctx->enable_mba_mbps = true;
-   return 0;
++  if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) {
++  ctx->enable_mba_mbps = true;
++  return 0;
++  }
++  break;
 +  }
 +
 +  return -EINVAL;
 +}
 +
 +static void rdt_fs_context_free(struct fs_context *fc)
 +{
 +  struct rdt_fs_context *ctx = rdt_fc2context(fc);
 +
 +  kernfs_free_fs_context(fc);
 +  kfree(ctx);
 +}
 +
 +static const struct fs_context_operations rdt_fs_context_ops = {
 +  .free   = rdt_fs_context_free,
 +  .parse_param= rdt_parse_param,
 +  .get_tree   = rdt_get_tree,
 +};
 +
 +static int rdt_init_fs_context(struct fs_context *fc, struct dentry 
*reference)
 +{
 +  struct rdt_fs_context *ctx;
 +
 +  ctx = kzalloc(sizeof(struct rdt_fs_context), GFP_KERNEL);
 +  if (!ctx)
 +  return -ENOMEM;
 +
 +  ctx->kfc.root = rdt_root;
 +  ctx->kfc.magic = RDTGROUP_SUPER_MAGIC;
 +  fc->fs_private = >kfc;
 +  fc->ops = _fs_context_ops;
 +  return 0;
  }
  
  static int reset_all_ctrls(struct rdt_resource *r)


pgpj3I5byCSbe.pgp
Description: OpenPGP digital signature


Re: linux-next: build warnings after merge of the cifs tree

2018-11-25 Thread Stephen Rothwell
Hi Steve,

On Sun, 25 Nov 2018 18:31:40 -0600 Steve French  wrote:
>
> Both of those cases are intentional fallthroughs and there are
> existing comments in the code noting the reasons for them to
> fallthrough
> 
> (also can see the reasoning for these in the commits which introduced
> them from Sachin c369c9a4a7c82) and dde2356c84662)

I am not questioning that :-)

The gcc warning can be turned off by adding a /* fall through */
comment at the point the fall through happens.  Kees and others are
working on the several hundred other places that need annotating.

This one just popped up.

-- 
Cheers,
Stephen Rothwell


pgpRb5vGF9qTI.pgp
Description: OpenPGP digital signature


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

2018-11-25 Thread Stephen Rothwell
Hi Jaegeuk,

After merging the f2fs tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:

In file included from fs/f2fs/dir.c:11:
fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through 
[-Wimplicit-fallthrough=]
   if (set)
  ^
fs/f2fs/f2fs.h:2390:2: note: here
  case FI_DATA_EXIST:
  ^~~~

Exposed by my use of -Wimplicit-fallthrough

I am not sure why this has turned up now (as opposed to earlier today).

-- 
Cheers,
Stephen Rothwell


pgpLuhtUKqo3F.pgp
Description: OpenPGP digital signature


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

2018-11-25 Thread Stephen Rothwell
Hi all,

After merging the cifs tree, today's linux-next build (powerpc
ppc64_defconfig) produced these warnings:

fs/cifs/sess.c: In function 'cifs_select_sectype':
fs/cifs/sess.c:527:3: warning: this statement may fall through 
[-Wimplicit-fallthrough=]
   switch (requested) {
   ^~
fs/cifs/sess.c:540:2: note: here
  case CIFS_NEGFLAVOR_LANMAN:
  ^~~~
fs/cifs/connect.c: In function 'cifs_parse_mount_options':
fs/cifs/connect.c:1825:8: warning: this statement may fall through 
[-Wimplicit-fallthrough=]
if (!(tmp_end < end && tmp_end[1] == delim)) {
^~~
fs/cifs/connect.c:1832:3: note: here
   case Opt_pass:
   ^~~~

Exposed by my use of -Wimplicit-fallthrough

I am not sure why these only turned up now (as opposed to earlier today).

-- 
Cheers,
Stephen Rothwell


pgpw1Ze7s2TiL.pgp
Description: OpenPGP digital signature


linux-next: build warning after merge of the btrfs-kdave tree

2018-11-25 Thread Stephen Rothwell
Hi David,

After merging the btrfs-kdave tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:

In file included from include/linux/string.h:6,
 from arch/powerpc/include/asm/paca.h:19,
 from arch/powerpc/include/asm/current.h:16,
 from include/linux/sched.h:12,
 from fs/btrfs/volumes.c:6:
fs/btrfs/volumes.h: In function 'btrfs_op':
include/linux/compiler.h:77:22: warning: this statement may fall through 
[-Wimplicit-fallthrough=]
 # define unlikely(x) __builtin_expect(!!(x), 0)
  ^~
include/asm-generic/bug.h:72:2: note: in expansion of macro 'unlikely'
  unlikely(__ret_warn_on);\
  ^~~~
fs/btrfs/volumes.h:395:3: note: in expansion of macro 'WARN_ON_ONCE'
   WARN_ON_ONCE(1);
   ^~~~
In file included from fs/btrfs/volumes.c:22:
fs/btrfs/volumes.h:396:2: note: here
  case REQ_OP_READ:
  ^~~~

Introduced by commit

  cf8cddd38bab3 ("btrfs: don't abuse REQ_OP_* flags for btrfs_map_block")

exposed by my new use of -Wimplicit-fallthrough

I am not sure why this has only turned up now (as opposed to earlier
today).

-- 
Cheers,
Stephen Rothwell


pgpy7qqAVqyuI.pgp
Description: OpenPGP digital signature


linux-next: manual merge of the mips tree with the kbuild tree

2018-11-25 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the mips tree got a conflict in:

  arch/mips/Kconfig

between commit:

  eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci")

from the kbuild tree and commit:

  47bf2b031754 ("mips: sort list of configs for Malta")

from the mips 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/mips/Kconfig
index f4df8007fddb,e49b5a0c8585..
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -495,22 -498,23 +499,23 @@@ config MIPS_MALT
select BOOT_RAW
select BUILTIN_DTB
select CEVT_R4K
-   select CSRC_R4K
select CLKSRC_MIPS_GIC
select COMMON_CLK
+   select CSRC_R4K
select DMA_MAYBE_COHERENT
select GENERIC_ISA_DMA
-   select HAVE_PCSPKR_PLATFORM
-   select IRQ_MIPS_CPU
-   select MIPS_GIC
 +  select HAVE_PCI
+   select HAVE_PCSPKR_PLATFORM
 -  select HW_HAS_PCI
select I8253
select I8259
+   select IRQ_MIPS_CPU
+   select LIBFDT
select MIPS_BONITO64
select MIPS_CPU_SCACHE
+   select MIPS_GIC
select MIPS_L1_CACHE_SHIFT_6
-   select PCI_GT64XXX_PCI0
select MIPS_MSC
+   select PCI_GT64XXX_PCI0
select SMP_UP if SMP
select SWAP_IO_SPACE
select SYS_HAS_CPU_MIPS32_R1


pgpZ7dIweomWp.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 23

2018-11-22 Thread Stephen Rothwell
Hi all,

Changes since 20181122:

The drm-misc tree gained a conflict against the drm tree.

Non-merge commits (relative to Linus' tree): 4356
 4532 files changed, 198412 insertions(+), 142555 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (edeca3a769ad Merge tag 'sound-4.20-rc4' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (6b04114f6fae arc: [devboards] Add support of 
NFSv3 ACL)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (039e70a70c84 Merge branch 
'ibmvnic-Fix-queue-and-buffer-accounting-errors')
Merging bpf/master (dde7011a824c tools: bpftool: fix potential NULL pointer 
dereference in do_load)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (38d37baa8123 ipvs: call ip_vs_dst_notifier earlier 
than ipv6_dev_notf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (1770f0fa978e mt76: fix uninitialized mutex 
access setting rts threshold)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (24c3456c8d5e iser: set sector for ambiguous mr 
status errors)
Merging sound-current/for-linus (a6b0961b3989 ALSA: hda/ca0132 - fix AE-5 
pincfg)
Merging sound-asoc-fixes/for-linus (78a45f96f0a2 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (400dba3b3914 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (fc8bd12cfa5b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (63529eaa6164 usb: cdc-acm: add entry for Hiro 
(Conexant) modem)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type on unaligned transfers)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with 
fused value for SDM845)
M

linux-next: Tree for Nov 22

2018-11-21 Thread Stephen Rothwell
Hi all,

Changes since 20181121:

The bpf-next tree gained a conflict against the net-next tree.

Non-merge commits (relative to Linus' tree): 4106
 4327 files changed, 188873 insertions(+), 127896 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (92b419289cee Merge tag 'riscv-for-linus-4.20-rc4' of 
git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (6b04114f6fae arc: [devboards] Add support of 
NFSv3 ACL)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (f2cbd4852820 net/sched: act_police: fix race condition on 
state variables)
Merging bpf/master (569a933b03f3 bpf: allocate local storage buffers using 
GFP_ATOMIC)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (38d37baa8123 ipvs: call ip_vs_dst_notifier earlier 
than ipv6_dev_notf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (1770f0fa978e mt76: fix uninitialized mutex 
access setting rts threshold)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (a6b0961b3989 ALSA: hda/ca0132 - fix AE-5 
pincfg)
Merging sound-asoc-fixes/for-linus (78a45f96f0a2 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (74b54886f274 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (fc8bd12cfa5b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (63529eaa6164 usb: cdc-acm: add entry for Hiro 
(Conexant) modem)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type on unaligned transfers)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with 
fused value for SDM845)
M

Re: linux-next: Signed-off-by missing for commit in the regulator tree

2018-11-21 Thread Stephen Rothwell
Hi Doug,

On Wed, 21 Nov 2018 12:39:45 -0800 Doug Anderson  wrote:
>
> Argh.  When I squashed two commits together I must have clobbered the
> Signed-off-by.  :(  Is there a suggested way that I can fix this?

The only way it can be fixed is for Mark to rebase his tree and fix the
commit message.

-- 
Cheers,
Stephen Rothwell


pgpdeB4OyTujI.pgp
Description: OpenPGP digital signature


linux-next: Signed-off-by missing for commit in the regulator tree

2018-11-21 Thread Stephen Rothwell
Hi all,

Commit

  fe115f7fd44b ("regulator: core: Only count load for enabled consumers")

is missing a Signed-off-by from its author.

-- 
Cheers,
Stephen Rothwell


pgpUALVfSYcJM.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 21

2018-11-20 Thread Stephen Rothwell
Hi all,

Changes since 20181120:

The mlx5-next tree gained a conflict against the rdma tree.

The regulator tree lost its build failure.

The tip tree lost its build failure.

Non-merge commits (relative to Linus' tree): 3982
 4165 files changed, 184299 insertions(+), 123219 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (06e68fed3282 Merge tag 'media/v4.20-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (cadf9df27e7c tcp: Fix SOF_TIMESTAMPING_RX_HARDWARE to use 
the latest timestamp during TCP coalescing)
Merging bpf/master (569a933b03f3 bpf: allocate local storage buffers using 
GFP_ATOMIC)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (38d37baa8123 ipvs: call ip_vs_dst_notifier earlier 
than ipv6_dev_notf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (1770f0fa978e mt76: fix uninitialized mutex 
access setting rts threshold)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (a6b0961b3989 ALSA: hda/ca0132 - fix AE-5 
pincfg)
Merging sound-asoc-fixes/for-linus (17004df91cb9 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (84a15a81b923 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (fc8bd12cfa5b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (63529eaa6164 usb: cdc-acm: add entry for Hiro 
(Conexant) modem)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type on unaligned transfers)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always buil

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

2018-11-20 Thread Stephen Rothwell
Hi Leon,

Today's linux-next merge of the mlx5-next tree got a conflict in:

  drivers/infiniband/hw/mlx5/main.c

between commit:

  9afc97c29b03 ("mlx5: remove support for ib_get_vector_affinity")

from the rdma tree and commit:

  f2f3df550139 ("net/mlx5: EQ, Privatize eq_table and friends")

from the mlx5-next tree.

I fixed it up (the former removed some of the code modified by the latter)
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


pgpNrHHWkr9jC.pgp
Description: OpenPGP digital signature


Re: [PATCH -next 1/2] mm/memfd: make F_SEAL_FUTURE_WRITE seal more robust

2018-11-20 Thread Stephen Rothwell
Hi Joel,

On Tue, 20 Nov 2018 10:39:26 -0800 Joel Fernandes  
wrote:
>
> On Tue, Nov 20, 2018 at 07:13:17AM -0800, Andy Lutomirski wrote:
> > On Mon, Nov 19, 2018 at 9:21 PM Joel Fernandes (Google)
> >  wrote:  
> > >
> > > A better way to do F_SEAL_FUTURE_WRITE seal was discussed [1] last week
> > > where we don't need to modify core VFS structures to get the same
> > > behavior of the seal. This solves several side-effects pointed out by
> > > Andy [2].
> > >
> > > [1] https://lore.kernel.org/lkml/2018173650.ga256...@google.com/
> > > [2] 
> > > https://lore.kernel.org/lkml/69ce06cc-e47c-4992-848a-66eb23ee6...@amacapital.net/
> > >
> > > Suggested-by: Andy Lutomirski 
> > > Fixes: 5e653c2923fd ("mm: Add an F_SEAL_FUTURE_WRITE seal to memfd")  
> > 
> > What tree is that commit in?  Can we not just fold this in?  
> 
> It is in linux-next. Could we keep both commits so we have the history?

Well, its in Andrew's mmotm, so its up to him.

-- 
Cheers,
Stephen Rothwell


pgps_YtAVYYlY.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 20

2018-11-19 Thread Stephen Rothwell
Hi all,

Changes since 20181119:

The regulator tree gained a build failure so I used the version from
next-20181119.

The tip tree still had its build failure for which I applied a fix patch.

The staging tree gained a conflict against the drm tree.

Non-merge commits (relative to Linus' tree): 3686
 3827 files changed, 163514 insertions(+), 119003 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (f2ce1065e767 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (86322ba9571a arch/sparc: Use kzalloc_node)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (02968ccf0125 sctp: count sk_wmem_alloc by skb truesize in 
sctp_packet_transmit)
Merging bpf/master (569a933b03f3 bpf: allocate local storage buffers using 
GFP_ATOMIC)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (38d37baa8123 ipvs: call ip_vs_dst_notifier earlier 
than ipv6_dev_notf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (1770f0fa978e mt76: fix uninitialized mutex 
access setting rts threshold)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (a6b0961b3989 ALSA: hda/ca0132 - fix AE-5 
pincfg)
Merging sound-asoc-fixes/for-linus (aa3b61b00b20 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (ee9a51949580 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (c25bc4f2c8df Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (2f31a67f01a8 usb: xhci: Prevent bus suspend if a 
port connect change or polling state is detected)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type on unaligned transfers)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-fo

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

2018-11-19 Thread Stephen Rothwell
Hi all,

After merging the regulator tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "regulator_lock" [drivers/regulator/wm8350-regulator.ko] undefined!
ERROR: "regulator_unlock" [drivers/regulator/wm8350-regulator.ko] undefined!
ERROR: "regulator_unlock" [drivers/regulator/da9210-regulator.ko] undefined!
ERROR: "regulator_lock" [drivers/regulator/da9210-regulator.ko] undefined!

Caused by commit

  f8702f9e4aa7 ("regulator: core: Use ww_mutex for regulators locking")

I have used the regulator tree from next-20181119 for today.

-- 
Cheers,
Stephen Rothwell


pgpT42Gw0sVkS.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 19

2018-11-18 Thread Stephen Rothwell
Hi all,

Changes since 20181116:

Removed trees:  (not updated in more that a year)
aio, drm-panel, edac, idle, keys, kvm-mips, lightnvm,
nand-fixes, realtek, sunxi-drm, uuid, vfs-miklos

The tip tree still had its build failure for which I applied a fix patch.

The akpm tree lost a patch that turned up elsewhere.

Non-merge commits (relative to Linus' tree): 3389
 3518 files changed, 137024 insertions(+), 108059 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 286 trees (counting Linus' and 67 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 (9ff01193a20d Linux 4.20-rc3)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (25e19c1fe421 Merge tag 'libnvdimm-fixes-4.20-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (1c1274a56999 tipc: don't assume linear buffer when reading 
ancillary data)
Merging bpf/master (569a933b03f3 bpf: allocate local storage buffers using 
GFP_ATOMIC)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (38d37baa8123 ipvs: call ip_vs_dst_notifier earlier 
than ipv6_dev_notf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (1770f0fa978e mt76: fix uninitialized mutex 
access setting rts threshold)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (d99501b8575d ALSA: hda/ca0132 - Call 
pci_iounmap() instead of iounmap())
Merging sound-asoc-fixes/for-linus (f75d53d33907 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging regulator-fixes/for-linus (6b46411b9ed3 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (5dbff5ab4135 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (2f31a67f01a8 usb: xhci: Prevent bus suspend if a 
port connect change or polling state is detected)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type o

linux-next: removal of old trees

2018-11-18 Thread Stephen Rothwell
Hi all,

[This message is Bcc'd to the contacts of affected trees]

The following trees have not been updated for more than a year, so I am
removing them from linux-next.  If you want any of them reinstated,
please just send me an email.

TreeURL
---
aio git://git.kvack.org/~bcrl/aio-next.git#master
drm-panel   git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next
edac
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next
idle
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next
keys
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next
kvm-mips
git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next
lightnvmgit://github.com/OpenChannelSSD/linux.git#for-next
nand-fixes  git://git.infradead.org/linux-mtd.git#nand/fixes
realtek 
git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next
sunxi-drm   
git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next
uuidgit://git.infradead.org/users/hch/uuid.git#for-next
vfs-miklos  
git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next

-- 
Cheers,
Stephen Rothwell


pgpcoCxYl3vsR.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 16

2018-11-15 Thread Stephen Rothwell
Hi all,

Changes since 20181115:

The xtensa tree gained a conflict against Linus' tree.

The block tree gained a conflict against Linus' tree.

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 3059
 3132 files changed, 125660 insertions(+), 103426 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 298 trees (counting Linus' and 68 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 (da5322e65940 Merge tag 'selinux-pr-20181115' of 
git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (b2fed34a628d selftests/powerpc: Adjust wild_bctr 
to build with old binutils)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (08e14fe429a0 net_sched: sch_fq: ensure maxrate fq parameter 
applies to EDT flows)
Merging bpf/master (da85d8bfd151 kselftests/bpf: use ping6 as the default ipv6 
ping binary when it exists)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (29e3880109e3 netfilter: nf_tables: fix use-after-free 
when deleting compat expressions)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (d99501b8575d ALSA: hda/ca0132 - Call 
pci_iounmap() instead of iounmap())
Merging sound-asoc-fixes/for-linus (0e6f4dd73a24 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging regulator-fixes/for-linus (97f11d95dd75 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (7c9a8d31fb2a Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (2f31a67f01a8 usb: xhci: Prevent bus suspend if a 
port connect change or polling state is detected)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type on unaligned transfers)
Merging usb-serial-fixes

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

2018-11-15 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the block tree got a conflict in:

  block/blk.h

between commit:

  1adfc5e4136f ("block: make sure discard bio is aligned with logical block 
size")

from Linus' tree (precedes v4.20-rc2) and commit:

  079076b3416e ("block: remove deadline __deadline manipulation helpers")

from the block 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 block/blk.h
index 0089fefdf771,027a0ccc175e..
--- a/block/blk.h
+++ b/block/blk.h
@@@ -380,31 -233,6 +233,16 @@@ static inline void req_set_nomerge(stru
q->last_merge = NULL;
  }
  
- /*
-  * Steal a bit from this field for legacy IO path atomic IO marking. Note that
-  * setting the deadline clears the bottom bit, potentially clearing the
-  * completed bit. The user has to be OK with this (current ones are fine).
-  */
- static inline void blk_rq_set_deadline(struct request *rq, unsigned long time)
- {
-   rq->__deadline = time & ~0x1UL;
- }
- 
- static inline unsigned long blk_rq_deadline(struct request *rq)
- {
-   return rq->__deadline & ~0x1UL;
- }
- 
 +/*
 + * The max size one bio can handle is UINT_MAX becasue bvec_iter.bi_size
 + * is defined as 'unsigned int', meantime it has to aligned to with logical
 + * block size which is the minimum accepted unit by hardware.
 + */
 +static inline unsigned int bio_allowed_max_sectors(struct request_queue *q)
 +{
 +  return round_down(UINT_MAX, queue_logical_block_size(q)) >> 9;
 +}
 +
  /*
   * Internal io_context interface
   */


pgpfyhYR9szte.pgp
Description: OpenPGP digital signature


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

2018-11-15 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the xtensa tree got a conflict in:

  arch/xtensa/Makefile

between commit:

  37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules")

from Linus' tree (it precedes v4.20-rc1) and commit:

  7c17225f2059 ("xtensa: generate uapi header and syscall table header files")

from the xtensa 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/xtensa/Makefile
index be060dfb1cc3,1e7b179eb6fe..
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@@ -90,6 -93,15 +90,9 @@@ boot := arch/xtensa/boo
  all Image zImage uImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@
  
 -%.dtb:
 -  $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 -
 -dtbs: scripts
 -  $(Q)$(MAKE) $(build)=$(boot)/dts
 -
+ archheaders:
+   $(Q)$(MAKE) $(build)=arch/xtensa/kernel/syscalls all
+ 
  define archhelp
@echo '* Image   - Kernel ELF image with reset vector'
@echo '* zImage  - Compressed kernel image 
(arch/xtensa/boot/images/zImage.*)'


pgpEkRqDy2jkR.pgp
Description: OpenPGP digital signature


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

2018-11-15 Thread Stephen Rothwell
Hi all,

After merging the qcom tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

drivers/gpu/drm/msm/adreno/a6xx_gmu.c: In function 
'a6xx_gmu_rpmh_arc_votes_init.constprop':
drivers/gpu/drm/msm/adreno/a6xx_gmu.c:943:12: warning: 'pri_count' is used 
uninitialized in this function [-Wuninitialized]
  pri_count >>= 1;
^~~
drivers/gpu/drm/msm/adreno/a6xx_gmu.c:948:12: warning: 'sec_count' may be used 
uninitialized in this function [-Wmaybe-uninitialized]
  sec_count >>= 1;
^~~

Introduced by commit

  ed3cafa79ea7 ("soc: qcom: cmd-db: Stop memcpy()ing in cmd_db_read_aux_data()")

# CONFIG_QCOM_COMMAND_DB is not set

-- 
Cheers,
Stephen Rothwell


pgpSej275dAa5.pgp
Description: OpenPGP digital signature


linux-next: Signed-off-by missing for commit in the gfs2 tree

2018-11-15 Thread Stephen Rothwell
Hi all,

Commits

  25b76c531970 ("gfs2: add a helper function to get_log_header that can be used 
elsewhere")
  14e81158a6d6 ("gfs2: add more timing info to journal recovery process")

are missing a Signed-off-by from their committer.

-- 
Cheers,
Stephen Rothwell


pgpXuDY3_gFZl.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 15

2018-11-14 Thread Stephen Rothwell
Hi all,

Changes since 20181114:

New trees: gnss-fixes, gnss

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 2799
 2907 files changed, 117529 insertions(+), 99581 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 298 trees (counting Linus' and 68 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 (3472f66013d1 Merge tag 'acpi-4.20-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (2c7645b0f7d1 selftests/powerpc: Fix wild_bctr test 
to work on ppc64)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (db8ddde766ad Merge branch 'qed-Miscellaneous-bug-fixes')
Merging bpf/master (da85d8bfd151 kselftests/bpf: use ping6 as the default ipv6 
ping binary when it exists)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (29e3880109e3 netfilter: nf_tables: fix use-after-free 
when deleting compat expressions)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (d99501b8575d ALSA: hda/ca0132 - Call 
pci_iounmap() instead of iounmap())
Merging sound-asoc-fixes/for-linus (95026e01c800 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (2f729bc9888b Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (f8303a12bb45 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (11644a765952 xhci: Add quirk to workaround the 
errata seen on Cavium Thunder-X2 Soc)
Merging usb-gadget-fixes/fixes (2fc6d4be35fb usb: dwc3: gadget: fix ISOC TRB 
type on unaligned transfers)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always buil

linux-next: Signed-off-by missing for commits in the gnss-fixes tree

2018-11-14 Thread Stephen Rothwell
Hi Johan,

Commits

  9ac9252b4bcd ("gnss: sirf: fix synchronous write timeout")
  b1a003961711 ("gnss: serial: fix synchronous write timeout")

are missing a Signed-off-by from their author and committer.

-- 
Cheers,
Stephen Rothwell


pgpuxlManY7n2.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 14

2018-11-13 Thread Stephen Rothwell
Hi all,

Changes since 20181113:

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 2696
 2835 files changed, 114088 insertions(+), 98851 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 296 trees (counting Linus' and 67 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 (ccda4af0f4b9 Linux 4.20-rc2)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (f9af851aa8e7 kernel hacking: support building 
kernel with -Og optimization level)
Merging arc-current/for-curr (121e38e5acdc ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (2c7645b0f7d1 selftests/powerpc: Fix wild_bctr test 
to work on ppc64)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (77e461d14ed1 bnx2x: Assign unique DMAE channel number for 
FW DMAE transactions.)
Merging bpf/master (da85d8bfd151 kselftests/bpf: use ping6 as the default ipv6 
ping binary when it exists)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (29e3880109e3 netfilter: nf_tables: fix use-after-free 
when deleting compat expressions)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (d99501b8575d ALSA: hda/ca0132 - Call 
pci_iounmap() instead of iounmap())
Merging sound-asoc-fixes/for-linus (fed9aaa78a5f Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (4a6432ade8ba Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (f8303a12bb45 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (1a87119b7bcf Revert "ACPI/PCI: Pay attention to 
device-specific _PXM node values")
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (11644a765952 xhci: Add quirk to workaround the 
errata seen on Cavium Thunder-X2 Soc)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (778

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

2018-11-13 Thread Stephen Rothwell
Hi Mark,

After merging the spi tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

drivers/spi/spi-npcm-pspi.c: In function 'npcm_pspi_recv':
drivers/spi/spi-npcm-pspi.c:226:17: warning: 'val' may be used uninitialized in 
this function [-Wmaybe-uninitialized]
   *priv->rx_buf = val;
   ~~^

Introduced by commit

  2a22f1b30cee ("spi: npcm: add NPCM PSPI controller driver")

-- 
Cheers,
Stephen Rothwell


pgpBwwHC50GGs.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 13

2018-11-12 Thread Stephen Rothwell
Hi all,

Changes since 20181112:

The kbuild tree gained a conflict against the kbuild-current tree.

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 2535
 2699 files changed, 105795 insertions(+), 93590 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 296 trees (counting Linus' and 67 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 (ccda4af0f4b9 Linux 4.20-rc2)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (f9af851aa8e7 kernel hacking: support building 
kernel with -Og optimization level)
Merging arc-current/for-curr (f7171b8063ea ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (28c5bcf74fa0 KVM: PPC: Move and undef 
TRACE_INCLUDE_PATH/FILE)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (77e461d14ed1 bnx2x: Assign unique DMAE channel number for 
FW DMAE transactions.)
Merging bpf/master (da85d8bfd151 kselftests/bpf: use ping6 as the default ipv6 
ping binary when it exists)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (447750f281ab netfilter: nf_tables: don't use position 
attribute on rule replacement)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (65766ee0bf7f ALSA: oss: Use kvzalloc() for 
local buffer allocations)
Merging sound-asoc-fixes/for-linus (2ddacce7dae4 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (a8f436453ab6 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (40e5c5fa4d1b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (651022382c7f Linux 4.20-rc1)
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb.current/usb-linus (11644a765952 xhci: Add quirk to workaround the 
errata seen on Cavium Thunder-X2 Soc)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (778d2a611628 

linux-next: manual merge of the kbuild tree with the kbuild-current tree

2018-11-12 Thread Stephen Rothwell
Hi all,

Today's linux-next merge of the kbuild tree got a conflict in:

  init/Kconfig

between commit:

  f9af851aa8e7 ("kernel hacking: support building kernel with -Og optimization 
level")

from the kbuild-current tree and commit:

  a4219aff51b8 ("kernel hacking: support building kernel with -Og optimization 
level")

from the kbuild tree.

I fixed it up (I used the kbuild-current tree 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


pgpXEq19R7jp2.pgp
Description: OpenPGP digital signature


linux-next: Signed-off-by missing for commit in the nios2 tree

2018-11-12 Thread Stephen Rothwell
Hi Ley,

Commit

  a070f18a62df ("nios2: TLBMISC writes do not require PID bits to be set")

is missing a Signed-off-by from its committer.

-- 
Cheers,
Stephen Rothwell


pgprVLgNY0QsC.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 12

2018-11-11 Thread Stephen Rothwell
Hi all,

Changes since 20181109:

The bpf-next tree gained a conflict against the bpf tree.

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 2463
 2629 files changed, 104084 insertions(+), 92260 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 296 trees (counting Linus' and 67 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 (e255aee5b66c Merge tag 'tty-4.20-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (d5615e472d23 builddeb: Fix inclusion of dtbs in 
debian package)
Merging arc-current/for-curr (f7171b8063ea ARC: mm: fix uninitialised signal 
code in do_page_fault)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (28c5bcf74fa0 KVM: PPC: Move and undef 
TRACE_INCLUDE_PATH/FILE)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (7236ead1b149 act_mirred: clear skb->tstamp on redirect)
Merging bpf/master (da85d8bfd151 kselftests/bpf: use ping6 as the default ipv6 
ping binary when it exists)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (85b18b0237ce net: smsc95xx: Fix MTU range)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore 
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits)
Merging sound-current/for-linus (5e93a125f521 ALSA: hda - Fix incorrect 
clearance of thinkpad_acpi hooks)
Merging sound-asoc-fixes/for-linus (2ddacce7dae4 Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (a8f436453ab6 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (40e5c5fa4d1b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (651022382c7f Linux 4.20-rc1)
Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align 
data[] to ARCH_KMALLOC_MINALIGN)
Merging tty.current/tty-linus (e255aee5b66c Merge tag 'tty-4.20-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty)
Merging usb.current/usb-linus (11644a765952 xhci: Add quirk to workaround the 
errata seen on Cavium Thunder-X2 Soc)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (0238df646e62 Linux 4.19-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always b

linux-next: Tree for Nov 9

2018-11-08 Thread Stephen Rothwell
Hi all,

Changes since 20181108:

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 1966
 2112 files changed, 84671 insertions(+), 86429 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 296 trees (counting Linus' and 67 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 (b00d209241ff Merge tag 
'compiler-attributes-for-linus-v4.20-rc2' of https://github.com/ojeda/linux)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (02826a6ba301 kbuild: deb-pkg: fix bindeb-pkg 
breakage when O= is used)
Merging arc-current/for-curr (d94cf77e44d5 ARC: [plat-hsdk] Enable DW APB GPIO 
support)
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false 
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (24cc61d8cb5a arm64: memblock: don't permit 
memblock resizing until linear mapping is up)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (28c5bcf74fa0 KVM: PPC: Move and undef 
TRACE_INCLUDE_PATH/FILE)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (b25ddb00bc1b qlcnic: remove assumption that vlan_tci != 0)
Merging bpf/master (ea53abfab960 bonding/802.3ad: fix link_failure_count 
tracking)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (a422757e8c32 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (8d0be26c781a mac80211_hwsim: fix module init error 
paths for netlink)
Merging rdma-fixes/for-rc (651022382c7f Linux 4.20-rc1)
Merging sound-current/for-linus (5e93a125f521 ALSA: hda - Fix incorrect 
clearance of thinkpad_acpi hooks)
Merging sound-asoc-fixes/for-linus (bbb59292538e Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (a8f436453ab6 Merge branch 'regulator-4.20' 
into regulator-linus)
Merging spi-fixes/for-linus (40e5c5fa4d1b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (651022382c7f Linux 4.20-rc1)
Merging driver-core.current/driver-core-linus (651022382c7f Linux 4.20-rc1)
Merging tty.current/tty-linus (d0ffb805b729 arch/alpha, termios: implement 
BOTHER, IBSHIFT and termios2)
Merging usb.current/usb-linus (f6501f491990 USB: misc: appledisplay: add 20" 
Apple Cinema Display)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (0238df646e62 Linux 4.19-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (651022382c7f Linux 4.20-rc1)
Merging staging.current/staging-linus (c948c6915b62 staging: rtl8723bs: Fix 
incorrect sense of ether

linux-next: Signed-off-by missing for commit in the rdma tree

2018-11-08 Thread Stephen Rothwell
Hi all,

Commit

  5736c7c499f1 ("RDMA/rxe: Distinguish between down links and disabled links")

is missing a Signed-off-by from its committer.

-- 
Cheers,
Stephen Rothwell


pgpt_d59gvFav.pgp
Description: OpenPGP digital signature


linux-next: stats (Was: Linux 4.20-rc1)

2018-11-07 Thread Stephen Rothwell
Hi all,

As usual, the executive friendly graph is at
http://neuling.org/linux-next-size.html :-)

(No merge commits counted, next-20181019 was the last linux-next before
the merge window opened.)

Commits in v4.20-rc1 (relative to v4.19):  12125
Commits in next-20181019:  11296
Commits with the same SHA1:10466
Commits with the same patch_id:  526 (1)
Commits with the same subject line:   56 (1)

(1) not counting those in the lines above.

So commits in -rc1 that were in next-20181019: 11048 91%

Some breakdown of the list of extra commits (relative to next-20181019)
in -rc1:

Top ten first word of commit summary:

 86 net
 60 powerpc
 56 perf
 54 media
 36 drm
 33 pci
 32 thermal
 32 bpf
 23 ubifs
 21 selftests

Top ten authors:

 36 hans.verk...@cisco.com
 28 darrick.w...@oracle.com
 28 a...@redhat.com
 25 dhowe...@redhat.com
 24 s.ha...@pengutronix.de
 23 christophe.le...@c-s.fr
 21 kis...@ti.com
 21 da...@davemloft.net
 21 dan...@iogearbox.net
 21 bvanass...@acm.org

Top ten commiters:

161 da...@davemloft.net
 72 m...@ellerman.id.au
 65 a...@redhat.com
 54 mchehab+sams...@kernel.org
 41 edubez...@gmail.com
 33 lorenzo.pieral...@arm.com
 32 broo...@kernel.org
 31 h...@lst.de
 31 a...@kernel.org
 29 rich...@nod.at

There are also 250 commits in next-20181019 that didn't make it into
v4.20-rc1.

Top ten first word of commit summary:

 28 vfs
 21 mm
 18 leaking_addresses
 14 arm
 11 nfc
 10 interconnect
 10 btrfs
  9 xtensa
  7 arm-soc
  6 drm

Top ten authors:

 38 dhowe...@redhat.com
 19 a...@linux-foundation.org
 18 m...@tobin.cc
 11 a...@arndb.de
  9 jcmvb...@gmail.com
  9 georgi.dja...@linaro.org
  7 nbori...@suse.com
  6 han...@cmpxchg.org
  5 w...@csie.org
  5 s...@canb.auug.org.au

Some of Andrew's patches are fixes for other patches in his tree (and
have been merged into those).

Top ten commiters:

 75 s...@canb.auug.org.au
 40 dhowe...@redhat.com
 18 m...@tobin.cc
 13 georgi.dja...@linaro.org
 11 sa...@linux.intel.com
 10 dste...@suse.com
  9 sh...@kernel.org
  9 jcmvb...@gmail.com
  7 paul...@linux.vnet.ibm.com
  7 maxime.rip...@bootlin.com

Those commits by me are from the quilt series (mainly Andrew's mmotm
tree).

-- 
Cheers,
Stephen Rothwell


pgpMf2om4JnYW.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 8

2018-11-07 Thread Stephen Rothwell
Hi all,

Changes since 20181107:

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 1793
 1942 files changed, 81402 insertions(+), 84317 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 296 trees (counting Linus' and 67 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 (85758777c2a2 Merge tag 'hwmon-for-v4.20-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (02826a6ba301 kbuild: deb-pkg: fix bindeb-pkg 
breakage when O= is used)
Merging arc-current/for-curr (d94cf77e44d5 ARC: [plat-hsdk] Enable DW APB GPIO 
support)
Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() 
offset check)
Merging arm64-fixes/for-next/fixes (ca2b497253ad arm64: perf: Reject 
stand-alone CHAIN events for PMUv3)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (28c5bcf74fa0 KVM: PPC: Move and undef 
TRACE_INCLUDE_PATH/FILE)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (042cb5647815 net: phy: Allow BCM54616S PHY to setup 
internal TX/RX clock delay)
Merging bpf/master (ea53abfab960 bonding/802.3ad: fix link_failure_count 
tracking)
Merging ipsec/master (ca92e173ab34 xfrm: Fix bucket count reported to userspace)
Merging netfilter/master (a422757e8c32 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (8d0be26c781a mac80211_hwsim: fix module init error 
paths for netlink)
Merging rdma-fixes/for-rc (651022382c7f Linux 4.20-rc1)
Merging sound-current/for-linus (5e93a125f521 ALSA: hda - Fix incorrect 
clearance of thinkpad_acpi hooks)
Merging sound-asoc-fixes/for-linus (bbb59292538e Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (651022382c7f Linux 4.20-rc1)
Merging spi-fixes/for-linus (40e5c5fa4d1b Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (651022382c7f Linux 4.20-rc1)
Merging driver-core.current/driver-core-linus (651022382c7f Linux 4.20-rc1)
Merging tty.current/tty-linus (202dc3cc10b4 serial: sh-sci: Fix receive on 
SCIFA/SCIFB variants with DMA)
Merging usb.current/usb-linus (f6501f491990 USB: misc: appledisplay: add 20" 
Apple Cinema Display)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (0238df646e62 Linux 4.19-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (651022382c7f Linux 4.20-rc1)
Merging staging.current/staging-linus (c948c6915b62 staging: rtl8723bs: Fix 
incorrect sense of ether_addr_equal)
Merging char-mis

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

2018-11-07 Thread Stephen Rothwell
Hi Jens,

After merging the block tree, today's linux-next build (sparc64 defconfig)
produced this warning:

/home/sfr/next/next/drivers/block/sunvdc.c: In function 'init_queue':
/home/sfr/next/next/drivers/block/sunvdc.c:788:6: warning: unused variable 
'ret' [-Wunused-variable]
  int ret;
  ^~~

Introduced by commit

  fa182a1fa97d ("sunvdc: convert to blk-mq")

-- 
Cheers,
Stephen Rothwell


pgpcSA3bQNAS_.pgp
Description: OpenPGP digital signature


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

2018-11-07 Thread Stephen Rothwell
Hi Greg,

After merging the staging tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

In file included from include/linux/printk.h:336,
 from include/linux/kernel.h:14,
 from include/linux/clk.h:16,
 from drivers/staging/media/tegra-vde/tegra-vde.c:12:
drivers/staging/media/tegra-vde/tegra-vde.c: In function 
'tegra_vde_setup_iram_tables':
drivers/staging/media/tegra-vde/tegra-vde.c:265:5: warning: format '%d' expects 
argument of type 'int', but argument 6 has type 'long unsigned int' [-Wformat=]
 "\tFrame %d: frame_num = %d B_frame = %d\n",
 ^~~
include/linux/dynamic_debug.h:135:39: note: in definition of macro 
'dynamic_dev_dbg'
   __dynamic_dev_dbg(, dev, fmt, \
   ^~~
include/linux/device.h:1463:23: note: in expansion of macro 'dev_fmt'
  dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
   ^~~
drivers/staging/media/tegra-vde/tegra-vde.c:264:4: note: in expansion of macro 
'dev_dbg'
dev_dbg(vde->miscdev.parent,
^~~

Introduced by commit

  42e764d05712 ("staging: tegravde: replace bit assignment with macro")

-- 
Cheers,
Stephen Rothwell


pgpgham6d5bnJ.pgp
Description: OpenPGP digital signature


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

2018-11-07 Thread Stephen Rothwell
Hi Joerg,

After merging the iommu tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

In file included from include/linux/bitmap.h:10,
 from drivers/iommu/intel-iommu.c:24:
drivers/iommu/intel-iommu.c: In function 'iommu_calculate_agaw':
include/linux/kernel.h:845:29: warning: comparison of distinct pointer types 
lacks a cast
   (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
 ^~
include/linux/kernel.h:859:4: note: in expansion of macro '__typecheck'
   (__typecheck(x, y) && __no_side_effects(x, y))
^~~
include/linux/kernel.h:869:24: note: in expansion of macro '__safe_cmp'
  __builtin_choose_expr(__safe_cmp(x, y), \
^~
include/linux/kernel.h:878:19: note: in expansion of macro '__careful_cmp'
 #define min(x, y) __careful_cmp(x, y, <)
   ^
drivers/iommu/intel-iommu.c:668:9: note: in expansion of macro 'min'
  mgaw = min(cap_mgaw(iommu->cap), DEFAULT_DOMAIN_ADDRESS_WIDTH);
 ^~~

Introduced by commit

  248808a0fad0 ("iommu/vt-d: Respect max guest address width in agaw")

-- 
Cheers,
Stephen Rothwell


pgp1ahLB2ajJw.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 7

2018-11-06 Thread Stephen Rothwell
Hi all,

Changes since 20181106:

New trees: slimbus, nvmem

The tip tree still had its build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 1408
 1540 files changed, 69938 insertions(+), 65849 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 296 trees (counting Linus' and 67 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 (8053e5b93eca Merge tag 'trace-v4.20-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (02826a6ba301 kbuild: deb-pkg: fix bindeb-pkg 
breakage when O= is used)
Merging arc-current/for-curr (d94cf77e44d5 ARC: [plat-hsdk] Enable DW APB GPIO 
support)
Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() 
offset check)
Merging arm64-fixes/for-next/fixes (ca2b497253ad arm64: perf: Reject 
stand-alone CHAIN events for PMUv3)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (042cb5647815 net: phy: Allow BCM54616S PHY to setup 
internal TX/RX clock delay)
Merging bpf/master (ea53abfab960 bonding/802.3ad: fix link_failure_count 
tracking)
Merging ipsec/master (533555e5cbb6 xfrm: Fix error return code in 
xfrm_output_one())
Merging netfilter/master (a422757e8c32 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (b374e8686fc3 mt76: fix building without 
CONFIG_LEDS_CLASS)
Merging mac80211/master (8d0be26c781a mac80211_hwsim: fix module init error 
paths for netlink)
Merging rdma-fixes/for-rc (651022382c7f Linux 4.20-rc1)
Merging sound-current/for-linus (5e93a125f521 ALSA: hda - Fix incorrect 
clearance of thinkpad_acpi hooks)
Merging sound-asoc-fixes/for-linus (6eeb153e005f Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (651022382c7f Linux 4.20-rc1)
Merging spi-fixes/for-linus (66460685fb71 Merge branch 'spi-4.20' into 
spi-linus)
Merging pci-current/for-linus (651022382c7f Linux 4.20-rc1)
Merging driver-core.current/driver-core-linus (651022382c7f Linux 4.20-rc1)
Merging tty.current/tty-linus (202dc3cc10b4 serial: sh-sci: Fix receive on 
SCIFA/SCIFB variants with DMA)
Merging usb.current/usb-linus (651022382c7f Linux 4.20-rc1)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (0238df646e62 Linux 4.19-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (651022382c7f Linux 4.20-rc1)
Merging staging.current/staging-linus (651022382c7f Linux 4.20-rc1)
Merging char-misc.current/char-misc-linus (651022382c7f Linux 4.20-rc1)
Merging soundwire-fixes/fixes (651022382c7f Linux 4.2

linux-next: Signed-off-by missing for commit in the scsi-fixes tree

2018-11-06 Thread Stephen Rothwell
Hi Martin,

Commit

  85ee0a7b2d53 ("Revert "scsi: ufs: Disable blk-mq for now"")

is missing a Signed-off-by from its author and committer.

Reverts are commits, too.

-- 
Cheers,
Stephen Rothwell


pgpBKapSMDMx4.pgp
Description: OpenPGP digital signature


linux-next: Tree for Nov 6

2018-11-05 Thread Stephen Rothwell
Hi all,

Changes since 20181105:

New trees: risc-v-pjw, sifive, i3c-fixes, i3c

The drm-msm tree gained a conflict against the drm-misc tree.

The tip tree gained a build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 825
 1082 files changed, 50662 insertions(+), 15456 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, an allmodconfig 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 (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 294 trees (counting Linus' and 67 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 (651022382c7f Linux 4.20-rc1)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (02826a6ba301 kbuild: deb-pkg: fix bindeb-pkg 
breakage when O= is used)
Merging arc-current/for-curr (d94cf77e44d5 ARC: [plat-hsdk] Enable DW APB GPIO 
support)
Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() 
offset check)
Merging arm64-fixes/for-next/fixes (ca2b497253ad arm64: perf: Reject 
stand-alone CHAIN events for PMUv3)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and 
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and 
getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (6915ed86cca6 net/ipv6: Move anycast init/cleanup functions 
out of CONFIG_PROC_FS)
Merging bpf/master (ea53abfab960 bonding/802.3ad: fix link_failure_count 
tracking)
Merging ipsec/master (533555e5cbb6 xfrm: Fix error return code in 
xfrm_output_one())
Merging netfilter/master (f393808dc641 netfilter: conntrack: fix calculation of 
next bucket number in early_drop)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (651022382c7f Linux 4.20-rc1)
Merging mac80211/master (8d0be26c781a mac80211_hwsim: fix module init error 
paths for netlink)
Merging rdma-fixes/for-rc (a3671a4f973e RDMA/ucma: Fix Spectre v1 vulnerability)
Merging sound-current/for-linus (826b5de90c0b ALSA: firewire-lib: fix 
insufficient PCM rule for period/buffer size)
Merging sound-asoc-fixes/for-linus (237dea0eb12b Merge branch 'asoc-4.20' into 
asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (651022382c7f Linux 4.20-rc1)
Merging spi-fixes/for-linus (83665c6da9d3 Merge branch 'spi-4.19' into 
spi-linus)
Merging pci-current/for-linus (651022382c7f Linux 4.20-rc1)
Merging driver-core.current/driver-core-linus (651022382c7f Linux 4.20-rc1)
Merging tty.current/tty-linus (202dc3cc10b4 serial: sh-sci: Fix receive on 
SCIFA/SCIFB variants with DMA)
Merging usb.current/usb-linus (651022382c7f Linux 4.20-rc1)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of 
dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (0238df646e62 Linux 4.19-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (651022382c7f Linux 4.20-rc1)
Merging staging.current/staging-linus (651022382c7f Linux 4.20-rc1)
Merging char-misc.current/char-misc-linus (651022382c7f Linux 4.20-rc1)
Merging soundwire-fixes/fixes (6510223

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

2018-11-05 Thread Stephen Rothwell
Hi Linus,

After merging the gpio tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

drivers/gpio/gpiolib.c:1514:12: warning: 'devm_gpio_chip_match' defined but not 
used [-Wunused-function]
 static int devm_gpio_chip_match(struct device *dev, void *res, void *data)
^~~~

Caused by commit

  48207d7595d2 ("gpio: drop devm_gpiochip_remove()")

-- 
Cheers,
Stephen Rothwell


pgpIxmvuA4rA8.pgp
Description: OpenPGP digital signature


  1   2   3   4   5   6   7   8   9   10   >