RE: linux-next: Tree for Aug 29 (mlx5)

2019-08-29 Thread Haiyang Zhang


> -Original Message-
> From: Saeed Mahameed 
> Sent: Thursday, August 29, 2019 4:04 PM
> To: s...@canb.auug.org.au; Eran Ben Elisha ; linux-
> n...@vger.kernel.org; rdun...@infradead.org; Haiyang Zhang
> 
> Cc: linux-kernel@vger.kernel.org; net...@vger.kernel.org; Leon
> Romanovsky 
> Subject: Re: linux-next: Tree for Aug 29 (mlx5)
> 
> On Thu, 2019-08-29 at 21:48 +, Haiyang Zhang wrote:
> > > -Original Message-
> > > From: Saeed Mahameed 
> > > Sent: Thursday, August 29, 2019 2:32 PM
> > > To: s...@canb.auug.org.au; Eran Ben Elisha ;
> > > linux-
> > > n...@vger.kernel.org; rdun...@infradead.org; Haiyang Zhang
> > > 
> > > Cc: linux-kernel@vger.kernel.org; net...@vger.kernel.org; Leon
> > > Romanovsky 
> > > Subject: Re: linux-next: Tree for Aug 29 (mlx5)
> > >
> > > On Thu, 2019-08-29 at 12:55 -0700, Randy Dunlap wrote:
> > > > On 8/29/19 12:54 PM, Randy Dunlap wrote:
> > > > > On 8/29/19 4:08 AM, Stephen Rothwell wrote:
> > > > > > Hi all,
> > > > > >
> > > > > > Changes since 20190828:
> > > > > >
> > > > >
> > > > > on x86_64:
> > > > > when CONFIG_PCI_HYPERV=m
> > > >
> > > > and CONFIG_PCI_HYPERV_INTERFACE=m
> > > >
> > >
> > > Haiyang and Eran, I think CONFIG_PCI_HYPERV_INTERFACE was never
> > > supposed to be a module ? it supposed to provide an always available
> > > interface to drivers ..
> > >
> > > Anyway, maybe we need to imply CONFIG_PCI_HYPERV_INTERFACE in
> mlx5.
> >
> > The symbolic dependency by driver mlx5e,  automatically triggers
> > loading of pci_hyperv_interface module. And this module can be loaded
> > in any platforms.
> >
> 
> This only works when both are modules.
> 
> 
> > Currently, mlx5e driver has #if
> > IS_ENABLED(CONFIG_PCI_HYPERV_INTERFACE)
> > around the code using the interface.
> >
> > I agree --
> > Adding "select PCI_HYPERV_INTERFACE" for mlx5e will clean up these
> > #if's.
> >
> 
> No, not "select", "imply".
> 
> if one wants PCI_HYPERV_INTERFACE off, imply will keep it off for you.

This looks good.

- Haiyang


Re: linux-next: Tree for Aug 29 (mlx5)

2019-08-29 Thread Saeed Mahameed
On Thu, 2019-08-29 at 21:48 +, Haiyang Zhang wrote:
> > -Original Message-
> > From: Saeed Mahameed 
> > Sent: Thursday, August 29, 2019 2:32 PM
> > To: s...@canb.auug.org.au; Eran Ben Elisha ;
> > linux-
> > n...@vger.kernel.org; rdun...@infradead.org; Haiyang Zhang
> > 
> > Cc: linux-kernel@vger.kernel.org; net...@vger.kernel.org; Leon
> > Romanovsky 
> > Subject: Re: linux-next: Tree for Aug 29 (mlx5)
> > 
> > On Thu, 2019-08-29 at 12:55 -0700, Randy Dunlap wrote:
> > > On 8/29/19 12:54 PM, Randy Dunlap wrote:
> > > > On 8/29/19 4:08 AM, Stephen Rothwell wrote:
> > > > > Hi all,
> > > > > 
> > > > > Changes since 20190828:
> > > > > 
> > > > 
> > > > on x86_64:
> > > > when CONFIG_PCI_HYPERV=m
> > > 
> > > and CONFIG_PCI_HYPERV_INTERFACE=m
> > > 
> > 
> > Haiyang and Eran, I think CONFIG_PCI_HYPERV_INTERFACE was never
> > supposed to be a module ? it supposed to provide an always
> > available
> > interface to drivers ..
> > 
> > Anyway, maybe we need to imply CONFIG_PCI_HYPERV_INTERFACE in mlx5.
> 
> The symbolic dependency by driver mlx5e,  automatically triggers
> loading of
> pci_hyperv_interface module. And this module can be loaded in any
> platforms.
> 

This only works when both are modules. 


> Currently, mlx5e driver has #if
> IS_ENABLED(CONFIG_PCI_HYPERV_INTERFACE)
> around the code using the interface.
> 
> I agree --
> Adding "select PCI_HYPERV_INTERFACE" for mlx5e will clean up these
> #if's.
> 

No, not "select", "imply".

if one wants PCI_HYPERV_INTERFACE off, imply will keep it off for you.

> Thanks,
> - Haiyang


RE: linux-next: Tree for Aug 29 (mlx5)

2019-08-29 Thread Haiyang Zhang


> -Original Message-
> From: Saeed Mahameed 
> Sent: Thursday, August 29, 2019 2:32 PM
> To: s...@canb.auug.org.au; Eran Ben Elisha ; linux-
> n...@vger.kernel.org; rdun...@infradead.org; Haiyang Zhang
> 
> Cc: linux-kernel@vger.kernel.org; net...@vger.kernel.org; Leon
> Romanovsky 
> Subject: Re: linux-next: Tree for Aug 29 (mlx5)
> 
> On Thu, 2019-08-29 at 12:55 -0700, Randy Dunlap wrote:
> > On 8/29/19 12:54 PM, Randy Dunlap wrote:
> > > On 8/29/19 4:08 AM, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Changes since 20190828:
> > > >
> > >
> > > on x86_64:
> > > when CONFIG_PCI_HYPERV=m
> >
> > and CONFIG_PCI_HYPERV_INTERFACE=m
> >
> 
> Haiyang and Eran, I think CONFIG_PCI_HYPERV_INTERFACE was never
> supposed to be a module ? it supposed to provide an always available
> interface to drivers ..
> 
> Anyway, maybe we need to imply CONFIG_PCI_HYPERV_INTERFACE in mlx5.

The symbolic dependency by driver mlx5e,  automatically triggers loading of
pci_hyperv_interface module. And this module can be loaded in any platforms.

Currently, mlx5e driver has #if IS_ENABLED(CONFIG_PCI_HYPERV_INTERFACE)
around the code using the interface.

I agree --
Adding "select PCI_HYPERV_INTERFACE" for mlx5e will clean up these #if's.

Thanks,
- Haiyang


Re: linux-next: Tree for Aug 29 (mlx5)

2019-08-29 Thread Saeed Mahameed
On Thu, 2019-08-29 at 12:55 -0700, Randy Dunlap wrote:
> On 8/29/19 12:54 PM, Randy Dunlap wrote:
> > On 8/29/19 4:08 AM, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Changes since 20190828:
> > > 
> > 
> > on x86_64:
> > when CONFIG_PCI_HYPERV=m
> 
> and CONFIG_PCI_HYPERV_INTERFACE=m
> 

Haiyang and Eran, I think CONFIG_PCI_HYPERV_INTERFACE was never
supposed to be a module ? it supposed to provide an always available 
interface to drivers .. 

Anyway, maybe we need to imply CONFIG_PCI_HYPERV_INTERFACE in mlx5.

Thanks,
Saeed.
 
> > and mxlx5 is builtin (=y).
> > 
> > ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function
> > `mlx5_unload':
> > main.c:(.text+0x5d): undefined reference to `mlx5_hv_vhca_cleanup'
> > ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function
> > `mlx5_cleanup_once':
> > main.c:(.text+0x158): undefined reference to `mlx5_hv_vhca_destroy'
> > ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function
> > `mlx5_load_one':
> > main.c:(.text+0x4191): undefined reference to `mlx5_hv_vhca_create'
> > ld: main.c:(.text+0x4772): undefined reference to
> > `mlx5_hv_vhca_init'
> > ld: main.c:(.text+0x4b07): undefined reference to
> > `mlx5_hv_vhca_cleanup'
> > 
> > 
> 
> 


Re: linux-next: Tree for Aug 29 (mlx5)

2019-08-29 Thread Randy Dunlap
On 8/29/19 12:54 PM, Randy Dunlap wrote:
> On 8/29/19 4:08 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20190828:
>>
> 
> 
> on x86_64:
> when CONFIG_PCI_HYPERV=m

and CONFIG_PCI_HYPERV_INTERFACE=m

> and mxlx5 is builtin (=y).
> 
> ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function `mlx5_unload':
> main.c:(.text+0x5d): undefined reference to `mlx5_hv_vhca_cleanup'
> ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function 
> `mlx5_cleanup_once':
> main.c:(.text+0x158): undefined reference to `mlx5_hv_vhca_destroy'
> ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function 
> `mlx5_load_one':
> main.c:(.text+0x4191): undefined reference to `mlx5_hv_vhca_create'
> ld: main.c:(.text+0x4772): undefined reference to `mlx5_hv_vhca_init'
> ld: main.c:(.text+0x4b07): undefined reference to `mlx5_hv_vhca_cleanup'
> 
> 


-- 
~Randy


Re: linux-next: Tree for Aug 29 (mlx5)

2019-08-29 Thread Randy Dunlap
On 8/29/19 4:08 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20190828:
> 


on x86_64:
when CONFIG_PCI_HYPERV=m
and mxlx5 is builtin (=y).

ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function `mlx5_unload':
main.c:(.text+0x5d): undefined reference to `mlx5_hv_vhca_cleanup'
ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function 
`mlx5_cleanup_once':
main.c:(.text+0x158): undefined reference to `mlx5_hv_vhca_destroy'
ld: drivers/net/ethernet/mellanox/mlx5/core/main.o: in function `mlx5_load_one':
main.c:(.text+0x4191): undefined reference to `mlx5_hv_vhca_create'
ld: main.c:(.text+0x4772): undefined reference to `mlx5_hv_vhca_init'
ld: main.c:(.text+0x4b07): undefined reference to `mlx5_hv_vhca_cleanup'


-- 
~Randy


linux-next: Tree for Aug 29

2019-08-29 Thread Stephen Rothwell
Hi all,

Changes since 20190828:

Added tree: smack

The vfs tree changed its conflict against the ceph tree.

The net-next tree gained a build failure for which I applied a patch.

The drm-misc tree lost its build failure.

The regulator tree gained a build failure for which I reverted a commit.

The keys tree gained a conflict against the security tree and a build
failure so I used the version from next-20190828.

The tip tree gained a conflict against the sound-asoc tree.

The driver-core tree gained a build failure for which I applied a patch.

Non-merge commits (relative to Linus' tree): 8965
 9127 files changed, 448048 insertions(+), 257089 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 310 trees (counting Linus' and 77 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 (9cf6b756cdf2 Merge tag 'arm64-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging fixes/master (609488bc979f Linux 5.3-rc2)
Merging kbuild-current/fixes (451577f3e3a9 Merge tag 'kbuild-fixes-v5.3-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging arc-current/for-curr (2f029413cbfb arc: prefer __section from 
compiler_attributes.h)
Merging arm-current/fixes (693898371711 ARM: 8897/1: check stmfd instruction 
using right shift)
Merging arm-soc-fixes/arm/fixes (305cd70ec311 Merge tag 'amlogic-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into 
arm/fixes)
Merging arm64-fixes/for-next/fixes (82e40f558de5 KVM: arm/arm64: vgic-v2: 
Handle SGI bits in GICD_I{S,C}PENDR0 as WI)
Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select 
ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire)
Merging powerpc-fixes/fixes (b9ee5e04fd77 powerpc/64e: Drop stale call to 
smp_processor_id() which hangs SMP startup)
Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (a84d01647989 mld: fix memory leak in mld_del_delrec())
Merging bpf/master (ede7c460b1da bpf: handle 32-bit zext during constant 
blinding)
Merging ipsec/master (769a807d0b41 xfrm: policy: avoid warning splat when 
merging nodes)
Merging netfilter/master (478553fd1b6f netfilter: conntrack: make sysctls 
per-namespace again)
Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes')
Merging wireless-drivers/master (5a8c31aa6357 iwlwifi: pcie: fix recognition of 
QuZ devices)
Merging mac80211/master (0d31d4dbf384 Revert "cfg80211: fix processing world 
regdomain when non modular")
Merging rdma-fixes/for-rc (c536277e0db1 RDMA/siw: Fix 64/32bit pointer 
inconsistency)
Merging sound-current/for-linus (2fd232939365 ALSA: oxfw: fix to handle correct 
stream for PCM playback)
Merging sound-asoc-fixes/for-linus (f382a7452a99 Merge branch 'asoc-5.3' into 
asoc-linus)
Merging regmap-fixes/for-linus (0161b8716465 Merge branch 'regmap-5.3' into 
regmap-linus)
Merging regulator-fixes/for-linus (8024a93ea4dd Merge branch 'regulator-5.3' 
into regulator-linus)
Merging spi-fixes/for-linus (7f83dd1551c5 Merge branch 'spi-5.3' into spi-linus)
Merging pci-current/for-linus (7bafda88de20 Documentation PCI: Fix 
pciebus-howto.rst filename 

linux-next: Tree for Aug 29

2018-08-28 Thread Stephen Rothwell
Hi all,

Changes since 20180828:

Removed tree: libata (merged into the block tree)

Dropped trees: xarray, ida (temporarily)

The spi tree gained a build failure so I used the version from
next-20180828.

Non-merge commits (relative to Linus' tree): 875
 1002 files changed, 29529 insertions(+), 9144 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 284 trees (counting Linus' and 65 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 (050cdc6c9501 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of 
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging kbuild-current/fixes (ad1d69735878 Merge tag 'fuse-update-4.19' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse)
Merging arc-current/for-curr (fce0d0affdc5 ARC: cleanup show_faulting_vma())
Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return 
for binutils 2.29+)
Merging arm64-fixes/for-next/fixes (5ad356eabc47 arm64: mm: check for upper 
PAGE_SHIFT bits in pfn_valid())
Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs 
for v4.18-rc6)
Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global 
invalidations when removing copro)
Merging sparc/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (53ae914d898e net/rds: Use rdma_read_gids to get connection 
SGID/DGID in IPv6)
Merging bpf/master (501ca81760c2 bpf: sockmap, decrement copied count correctly 
in redirect error case)
Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for 
new entries)
Merging netfilter/master (10568f6c5761 netfilter: xt_checksum: ignore gso skbs)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (53ae914d898e net/rds: Use rdma_read_gids to 
get connection SGID/DGID in IPv6)
Merging mac80211/master (b88d26d97c41 nl80211: Pass center frequency in kHz 
instead of MHz)
Merging rdma-fixes/for-rc (5b394b2ddf03 Linux 4.19-rc1)
Merging sound-current/for-linus (8a328ac1f9eb ALSA: hda/realtek - Fix HP 
Headset Mic can't record)
Merging sound-asoc-fixes/for-linus (cc276126e1bf Merge branch 'asoc-4.19' into 
asoc-linus)
Merging regmap-fixes/for-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging regulator-fixes/for-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging spi-fixes/for-linus (5223c9c1cbfc spi: spi-fsl-dspi: fix broken 
DSPI_EOQ_MODE)
Merging pci-current/for-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging driver-core.current/driver-core-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging tty.current/tty-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging usb.current/usb-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging usb-gadget-fixes/fixes (5b394b2ddf03 Linux 4.19-rc1)
Merging usb-serial-fixes/usb-linus (5dfdd24eb3d3 USB: serial: ti_usb_3410_5052: 
fix array underflow in completion handler)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for 
status lines)
Merging 

linux-next: Tree for Aug 29

2018-08-28 Thread Stephen Rothwell
Hi all,

Changes since 20180828:

Removed tree: libata (merged into the block tree)

Dropped trees: xarray, ida (temporarily)

The spi tree gained a build failure so I used the version from
next-20180828.

Non-merge commits (relative to Linus' tree): 875
 1002 files changed, 29529 insertions(+), 9144 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 284 trees (counting Linus' and 65 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 (050cdc6c9501 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of 
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging kbuild-current/fixes (ad1d69735878 Merge tag 'fuse-update-4.19' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse)
Merging arc-current/for-curr (fce0d0affdc5 ARC: cleanup show_faulting_vma())
Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return 
for binutils 2.29+)
Merging arm64-fixes/for-next/fixes (5ad356eabc47 arm64: mm: check for upper 
PAGE_SHIFT bits in pfn_valid())
Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs 
for v4.18-rc6)
Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global 
invalidations when removing copro)
Merging sparc/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (53ae914d898e net/rds: Use rdma_read_gids to get connection 
SGID/DGID in IPv6)
Merging bpf/master (501ca81760c2 bpf: sockmap, decrement copied count correctly 
in redirect error case)
Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for 
new entries)
Merging netfilter/master (10568f6c5761 netfilter: xt_checksum: ignore gso skbs)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates 
of non-anonymous set)
Merging wireless-drivers/master (53ae914d898e net/rds: Use rdma_read_gids to 
get connection SGID/DGID in IPv6)
Merging mac80211/master (b88d26d97c41 nl80211: Pass center frequency in kHz 
instead of MHz)
Merging rdma-fixes/for-rc (5b394b2ddf03 Linux 4.19-rc1)
Merging sound-current/for-linus (8a328ac1f9eb ALSA: hda/realtek - Fix HP 
Headset Mic can't record)
Merging sound-asoc-fixes/for-linus (cc276126e1bf Merge branch 'asoc-4.19' into 
asoc-linus)
Merging regmap-fixes/for-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging regulator-fixes/for-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging spi-fixes/for-linus (5223c9c1cbfc spi: spi-fsl-dspi: fix broken 
DSPI_EOQ_MODE)
Merging pci-current/for-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging driver-core.current/driver-core-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging tty.current/tty-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging usb.current/usb-linus (5b394b2ddf03 Linux 4.19-rc1)
Merging usb-gadget-fixes/fixes (5b394b2ddf03 Linux 4.19-rc1)
Merging usb-serial-fixes/usb-linus (5dfdd24eb3d3 USB: serial: ti_usb_3410_5052: 
fix array underflow in completion handler)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: 
Always build ULPI code)
Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for 
status lines)
Merging 

linux-next: Tree for Aug 29

2017-08-29 Thread Stephen Rothwell
Hi all,

Changes since 20170828:

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

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

The sound-asoc tree still had its build failure for which I reverted
a commit.

The md tree gained a conflict against the block tree.

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

The scsi tree lost its build failure.

The tty tree gained conflicts against the parisc-hd tree.

Non-merge commits (relative to Linus' tree): 9803
 9604 files changed, 514220 insertions(+), 182518 deletions(-)



I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log
files in the Next directory.  Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And
finally, a simple boot test of the powerpc pseries_le_defconfig kernel
in qemu.

Below is a summary of the state of the merge.

I am currently merging 268 trees (counting Linus' and 41 trees of bug
fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (702e97621ec7 Merge tag 'for-linus' of 
git://linux-c6x.org/git/projects/linux-c6x-upstreaming)
Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig 
entry)
Merging kbuild-current/fixes (64236e315955 kbuild: update comments of 
Makefile.asm-generic)
Merging arc-current/for-curr (7c0d0c977b89 ARCv2: SMP: Mask only 
private-per-core IRQ lines on boot at core intc)
Merging arm-current/fixes (1abd35023763 ARM: align .data section)
Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (1a92a80ad386 powerpc/mm: Ensure cpumask update is 
ordered)
Merging sparc/master (6470812e2226 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and 
linking special files)
Merging net/master (ef9a5a62c634 bridge: check for null fdb->dst before 
notifying switchdev drivers)
Merging ipsec/master (8a4b5784fac2 net: xfrm: don't double-hold dst when 
sk_policy in use.)
Merging netfilter/master (f63ae01d890c Merge tag 
'wireless-drivers-for-davem-2017-08-25' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook 
mask only if set)
Merging wireless-drivers/master (10a54d8196d1 iwlwifi: pcie: move rx workqueue 
initialization to iwl_trans_pcie_alloc())
Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in 
NL80211_ATTR_SCAN_FREQUENCIES)
Merging sound-current/for-linus (9ce76511b67b ASoC: rt5677: Reintroduce I2C 
device IDs)
Merging pci-current/for-linus (8e1101d25164 PCI/MSI: Don't warn when 
irq_create_affinity_masks() returns NULL)
Merging driver-core.current/driver-core-linus (ef954844c7ac Linux 4.13-rc5)
Merging tty.current/tty-linus (ef954844c7ac Linux 4.13-rc5)
Merging usb.current/usb-linus (ef954844c7ac Linux 4.13-rc5)
Merging usb-gadget-fixes/fixes (b7d44c36a6f6 usb: renesas_usbhs: gadget: fix 
unused-but-set-variable warning)
Merging usb-serial-fixes/usb-linus (fd1b8668af59 USB: serial: option: add 
D-Link DWM-222 device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: 
check before accessing ci_role in ci_role_show)
Merging phy/fixes (5771a8c08880 Linux v4.13-rc1)
Merging staging.current/staging-linus (cc4a41fe5541 Linux 4.13-rc7)
Merging char-misc.current/char-misc-linus (cc4a41fe5541 Linux 4.13-rc7)
Merging 

linux-next: Tree for Aug 29

2017-08-29 Thread Stephen Rothwell
Hi all,

Changes since 20170828:

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

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

The sound-asoc tree still had its build failure for which I reverted
a commit.

The md tree gained a conflict against the block tree.

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

The scsi tree lost its build failure.

The tty tree gained conflicts against the parisc-hd tree.

Non-merge commits (relative to Linus' tree): 9803
 9604 files changed, 514220 insertions(+), 182518 deletions(-)



I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log
files in the Next directory.  Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And
finally, a simple boot test of the powerpc pseries_le_defconfig kernel
in qemu.

Below is a summary of the state of the merge.

I am currently merging 268 trees (counting Linus' and 41 trees of bug
fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (702e97621ec7 Merge tag 'for-linus' of 
git://linux-c6x.org/git/projects/linux-c6x-upstreaming)
Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig 
entry)
Merging kbuild-current/fixes (64236e315955 kbuild: update comments of 
Makefile.asm-generic)
Merging arc-current/for-curr (7c0d0c977b89 ARCv2: SMP: Mask only 
private-per-core IRQ lines on boot at core intc)
Merging arm-current/fixes (1abd35023763 ARM: align .data section)
Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (1a92a80ad386 powerpc/mm: Ensure cpumask update is 
ordered)
Merging sparc/master (6470812e2226 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and 
linking special files)
Merging net/master (ef9a5a62c634 bridge: check for null fdb->dst before 
notifying switchdev drivers)
Merging ipsec/master (8a4b5784fac2 net: xfrm: don't double-hold dst when 
sk_policy in use.)
Merging netfilter/master (f63ae01d890c Merge tag 
'wireless-drivers-for-davem-2017-08-25' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook 
mask only if set)
Merging wireless-drivers/master (10a54d8196d1 iwlwifi: pcie: move rx workqueue 
initialization to iwl_trans_pcie_alloc())
Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in 
NL80211_ATTR_SCAN_FREQUENCIES)
Merging sound-current/for-linus (9ce76511b67b ASoC: rt5677: Reintroduce I2C 
device IDs)
Merging pci-current/for-linus (8e1101d25164 PCI/MSI: Don't warn when 
irq_create_affinity_masks() returns NULL)
Merging driver-core.current/driver-core-linus (ef954844c7ac Linux 4.13-rc5)
Merging tty.current/tty-linus (ef954844c7ac Linux 4.13-rc5)
Merging usb.current/usb-linus (ef954844c7ac Linux 4.13-rc5)
Merging usb-gadget-fixes/fixes (b7d44c36a6f6 usb: renesas_usbhs: gadget: fix 
unused-but-set-variable warning)
Merging usb-serial-fixes/usb-linus (fd1b8668af59 USB: serial: option: add 
D-Link DWM-222 device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: 
check before accessing ci_role in ci_role_show)
Merging phy/fixes (5771a8c08880 Linux v4.13-rc1)
Merging staging.current/staging-linus (cc4a41fe5541 Linux 4.13-rc7)
Merging char-misc.current/char-misc-linus (cc4a41fe5541 Linux 4.13-rc7)
Merging 

Re: linux-next: Tree for Aug 29

2014-09-02 Thread Tejun Heo
On Mon, Sep 01, 2014 at 04:15:52PM -0500, Christoph Lameter wrote:
> On Mon, 1 Sep 2014, Guenter Roeck wrote:
> 
> > arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
> > arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand 
> > of assignment
> > make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
> > make: *** [arch/ia64/sn/kernel/setup.o] Error 2
> 
> 
> Subject: ia64: sn_nodepda cannot be assigned to after this_cpu conversion. 
> Use __this_cpu_write.
> 
> There must be an explit statement to modify the percpu variable after the 
> conversion of the
> sn_nodpda macro to use this_cpu_read.
> 
> Signed-off-by: Christoph Lameter 

Applied to percpu/for-3.18-consistent-ops.

Thanks.

-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-09-02 Thread Tejun Heo
On Mon, Sep 01, 2014 at 04:15:52PM -0500, Christoph Lameter wrote:
 On Mon, 1 Sep 2014, Guenter Roeck wrote:
 
  arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
  arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand 
  of assignment
  make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
  make: *** [arch/ia64/sn/kernel/setup.o] Error 2
 
 
 Subject: ia64: sn_nodepda cannot be assigned to after this_cpu conversion. 
 Use __this_cpu_write.
 
 There must be an explit statement to modify the percpu variable after the 
 conversion of the
 sn_nodpda macro to use this_cpu_read.
 
 Signed-off-by: Christoph Lameter c...@linux.com

Applied to percpu/for-3.18-consistent-ops.

Thanks.

-- 
tejun
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-09-01 Thread Guenter Roeck

On 09/01/2014 02:15 PM, Christoph Lameter wrote:

On Mon, 1 Sep 2014, Guenter Roeck wrote:


arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand of 
assignment
make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
make: *** [arch/ia64/sn/kernel/setup.o] Error 2



Subject: ia64: sn_nodepda cannot be assigned to after this_cpu conversion. Use 
__this_cpu_write.

There must be an explit statement to modify the percpu variable after the 
conversion of the
sn_nodpda macro to use this_cpu_read.

Signed-off-by: Christoph Lameter 


FWIW: Compile-tested-by: Guenter Roeck 

Too bad there is no ia64 support in qemu; this could use some "real" testing.

Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-09-01 Thread Christoph Lameter
On Mon, 1 Sep 2014, Guenter Roeck wrote:

> arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
> arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand of 
> assignment
> make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
> make: *** [arch/ia64/sn/kernel/setup.o] Error 2


Subject: ia64: sn_nodepda cannot be assigned to after this_cpu conversion. Use 
__this_cpu_write.

There must be an explit statement to modify the percpu variable after the 
conversion of the
sn_nodpda macro to use this_cpu_read.

Signed-off-by: Christoph Lameter 

Index: linux/arch/ia64/sn/kernel/setup.c
===
--- linux.orig/arch/ia64/sn/kernel/setup.c
+++ linux/arch/ia64/sn/kernel/setup.c
@@ -629,7 +629,7 @@ void sn_cpu_init(void)

cnode = nasid_to_cnodeid(nasid);

-   sn_nodepda = nodepdaindr[cnode];
+   __this_cpu_write(__sn_nodepda, nodepdaindr[cnode]);

pda->led_address =
(typeof(pda->led_address)) (LED0 + (slice << LED_CPU_SHIFT));
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-09-01 Thread Guenter Roeck
On Fri, Aug 29, 2014 at 03:07:13PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> I will be on vacation for the next week, so the next linux-next that I
> will release will be next-20140908.  Sorry for the inconvenience.
> 
> Changes since 20140828:
> 
> The staging tree still had its build failure for which I applied a
> fix patch.
> 
> Non-merge commits (relative to Linus' tree): 2327
>  2465 files changed, 66838 insertions(+), 40620 deletions(-)
> 
> 
> 
ia64:defconfig is broken with this build and results in the following error
message.

arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand of 
assignment
make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
make: *** [arch/ia64/sn/kernel/setup.o] Error 2

bisect points to commit 6065a244a039 ('ia64: Replace __get_cpu_var uses').

$ git bisect log
# bad: [d7cf2b3139909a354a71e2885c942e21a60ea062] Add linux-next specific files 
for 20140829
# good: [52addcf9d6669fa439387610bc65c92fa0980cef] Linux 3.17-rc2
git bisect start 'HEAD' 'v3.17-rc2'
# good: [a065408138b1e9876a95c30153087617e9ef56df] Merge remote-tracking branch 
'crypto/master'
git bisect good a065408138b1e9876a95c30153087617e9ef56df
# good: [8032bd58d53bf68cc618ed3c945654d495a3381e] Merge remote-tracking branch 
'xen-tip/linux-next'
git bisect good 8032bd58d53bf68cc618ed3c945654d495a3381e
# bad: [937c09a4fafaa87793584723a9c78070ba1313c7] Merge remote-tracking branch 
'staging/staging-next'
git bisect bad 937c09a4fafaa87793584723a9c78070ba1313c7
# good: [09d6dd7490ee7f1dda926e309df370e28679a71c] staging: comedi: 8255: add a 
comedi_device param to the (*io) callback
git bisect good 09d6dd7490ee7f1dda926e309df370e28679a71c
# bad: [436011f94749fe990ca1fafbdb28d5dc4abe9120] Merge remote-tracking branch 
'regmap/for-next'
git bisect bad 436011f94749fe990ca1fafbdb28d5dc4abe9120
# bad: [0b3fd10cf0cda8f319eae27adffb8b7a45431702] Merge remote-tracking branch 
'workqueues/for-next'
git bisect bad 0b3fd10cf0cda8f319eae27adffb8b7a45431702
# bad: [6065a244a039a23d933e4b803a4e052da2849208] ia64: Replace __get_cpu_var 
uses
git bisect bad 6065a244a039a23d933e4b803a4e052da2849208
# good: [903ceff7ca7b4d80c083a80ee5163b74e9fa359f] net: Replace get_cpu_var 
through this_cpu_ptr
git bisect good 903ceff7ca7b4d80c083a80ee5163b74e9fa359f
# good: [e16321709c8270f9803bbfdb51e5e02235078c7f] uv: Replace __get_cpu_var
git bisect good e16321709c8270f9803bbfdb51e5e02235078c7f
# good: [35898716b4d3382791d219be317faace580b6a41] mips: Replace __get_cpu_var 
uses
git bisect good 35898716b4d3382791d219be317faace580b6a41
# good: [0bf7fcf155160fd483af7ffdc50efd4be96f1c96] s390: cio driver 
&__get_cpu_var replacements
git bisect good 0bf7fcf155160fd483af7ffdc50efd4be96f1c96
# first bad commit: [6065a244a039a23d933e4b803a4e052da2849208] ia64: Replace 
__get_cpu_var uses

Reverting the bad commit fixes the problem.

Guenter
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-09-01 Thread Guenter Roeck
On Fri, Aug 29, 2014 at 03:07:13PM +1000, Stephen Rothwell wrote:
 Hi all,
 
 I will be on vacation for the next week, so the next linux-next that I
 will release will be next-20140908.  Sorry for the inconvenience.
 
 Changes since 20140828:
 
 The staging tree still had its build failure for which I applied a
 fix patch.
 
 Non-merge commits (relative to Linus' tree): 2327
  2465 files changed, 66838 insertions(+), 40620 deletions(-)
 
 
 
ia64:defconfig is broken with this build and results in the following error
message.

arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand of 
assignment
make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
make: *** [arch/ia64/sn/kernel/setup.o] Error 2

bisect points to commit 6065a244a039 ('ia64: Replace __get_cpu_var uses').

$ git bisect log
# bad: [d7cf2b3139909a354a71e2885c942e21a60ea062] Add linux-next specific files 
for 20140829
# good: [52addcf9d6669fa439387610bc65c92fa0980cef] Linux 3.17-rc2
git bisect start 'HEAD' 'v3.17-rc2'
# good: [a065408138b1e9876a95c30153087617e9ef56df] Merge remote-tracking branch 
'crypto/master'
git bisect good a065408138b1e9876a95c30153087617e9ef56df
# good: [8032bd58d53bf68cc618ed3c945654d495a3381e] Merge remote-tracking branch 
'xen-tip/linux-next'
git bisect good 8032bd58d53bf68cc618ed3c945654d495a3381e
# bad: [937c09a4fafaa87793584723a9c78070ba1313c7] Merge remote-tracking branch 
'staging/staging-next'
git bisect bad 937c09a4fafaa87793584723a9c78070ba1313c7
# good: [09d6dd7490ee7f1dda926e309df370e28679a71c] staging: comedi: 8255: add a 
comedi_device param to the (*io) callback
git bisect good 09d6dd7490ee7f1dda926e309df370e28679a71c
# bad: [436011f94749fe990ca1fafbdb28d5dc4abe9120] Merge remote-tracking branch 
'regmap/for-next'
git bisect bad 436011f94749fe990ca1fafbdb28d5dc4abe9120
# bad: [0b3fd10cf0cda8f319eae27adffb8b7a45431702] Merge remote-tracking branch 
'workqueues/for-next'
git bisect bad 0b3fd10cf0cda8f319eae27adffb8b7a45431702
# bad: [6065a244a039a23d933e4b803a4e052da2849208] ia64: Replace __get_cpu_var 
uses
git bisect bad 6065a244a039a23d933e4b803a4e052da2849208
# good: [903ceff7ca7b4d80c083a80ee5163b74e9fa359f] net: Replace get_cpu_var 
through this_cpu_ptr
git bisect good 903ceff7ca7b4d80c083a80ee5163b74e9fa359f
# good: [e16321709c8270f9803bbfdb51e5e02235078c7f] uv: Replace __get_cpu_var
git bisect good e16321709c8270f9803bbfdb51e5e02235078c7f
# good: [35898716b4d3382791d219be317faace580b6a41] mips: Replace __get_cpu_var 
uses
git bisect good 35898716b4d3382791d219be317faace580b6a41
# good: [0bf7fcf155160fd483af7ffdc50efd4be96f1c96] s390: cio driver 
__get_cpu_var replacements
git bisect good 0bf7fcf155160fd483af7ffdc50efd4be96f1c96
# first bad commit: [6065a244a039a23d933e4b803a4e052da2849208] ia64: Replace 
__get_cpu_var uses

Reverting the bad commit fixes the problem.

Guenter
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-09-01 Thread Christoph Lameter
On Mon, 1 Sep 2014, Guenter Roeck wrote:

 arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
 arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand of 
 assignment
 make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
 make: *** [arch/ia64/sn/kernel/setup.o] Error 2


Subject: ia64: sn_nodepda cannot be assigned to after this_cpu conversion. Use 
__this_cpu_write.

There must be an explit statement to modify the percpu variable after the 
conversion of the
sn_nodpda macro to use this_cpu_read.

Signed-off-by: Christoph Lameter c...@linux.com

Index: linux/arch/ia64/sn/kernel/setup.c
===
--- linux.orig/arch/ia64/sn/kernel/setup.c
+++ linux/arch/ia64/sn/kernel/setup.c
@@ -629,7 +629,7 @@ void sn_cpu_init(void)

cnode = nasid_to_cnodeid(nasid);

-   sn_nodepda = nodepdaindr[cnode];
+   __this_cpu_write(__sn_nodepda, nodepdaindr[cnode]);

pda-led_address =
(typeof(pda-led_address)) (LED0 + (slice  LED_CPU_SHIFT));
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-09-01 Thread Guenter Roeck

On 09/01/2014 02:15 PM, Christoph Lameter wrote:

On Mon, 1 Sep 2014, Guenter Roeck wrote:


arch/ia64/sn/kernel/setup.c: In function 'sn_cpu_init':
arch/ia64/sn/kernel/setup.c:632:13: error: lvalue required as left operand of 
assignment
make[1]: *** [arch/ia64/sn/kernel/setup.o] Error 1
make: *** [arch/ia64/sn/kernel/setup.o] Error 2



Subject: ia64: sn_nodepda cannot be assigned to after this_cpu conversion. Use 
__this_cpu_write.

There must be an explit statement to modify the percpu variable after the 
conversion of the
sn_nodpda macro to use this_cpu_read.

Signed-off-by: Christoph Lameter c...@linux.com


FWIW: Compile-tested-by: Guenter Roeck li...@roeck-us.net

Too bad there is no ia64 support in qemu; this could use some real testing.

Guenter

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Aug 29

2014-08-29 Thread Mark Brown
On Fri, Aug 29, 2014 at 03:07:13PM +1000, Stephen Rothwell wrote:

> I will be on vacation for the next week, so the next linux-next that I
> will release will be next-20140908.  Sorry for the inconvenience.

I'm going to try to cover this with the usual reduced service so
hopefully there should be some builds next week.


signature.asc
Description: Digital signature


Re: linux-next: Tree for Aug 29

2014-08-29 Thread Mark Brown
On Fri, Aug 29, 2014 at 03:07:13PM +1000, Stephen Rothwell wrote:

 I will be on vacation for the next week, so the next linux-next that I
 will release will be next-20140908.  Sorry for the inconvenience.

I'm going to try to cover this with the usual reduced service so
hopefully there should be some builds next week.


signature.asc
Description: Digital signature


linux-next: Tree for Aug 29

2014-08-28 Thread Stephen Rothwell
Hi all,

I will be on vacation for the next week, so the next linux-next that I
will release will be next-20140908.  Sorry for the inconvenience.

Changes since 20140828:

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

Non-merge commits (relative to Linus' tree): 2327
 2465 files changed, 66838 insertions(+), 40620 deletions(-)



I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm
defconfig.

Below is a summary of the state of the merge.

I am currently merging 220 trees (counting Linus' and 30 trees of patches
pending for Linus' tree).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (59753a805499 Merge tag 'backlight-fixes-3.17' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight)
Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org 
backwards" error)
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
Merging arm-current/fixes (eba1c71819d2 ARM: 8130/1: 
cpuidle/cpuidle-big_little: fix reading cpu id part number)
Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement 
no longer needed)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of 
flash_block_list in rtas_flash)
Merging sparc/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging net/master (7a4cecf74c16 phy: fix EEE checks inside the phy_init_eee.)
Merging ipsec/master (2d39d120781a mvneta: Add missing if_vlan.h include.)
Merging sound-current/for-linus (1a22e7758eab ALSA: hda - Set up initial pins 
for Acer Aspire V5)
Merging pci-current/for-linus (8d7004a6904c PCI: spear: Remove module option)
Merging wireless/master (c66517165610 rtlwifi: rtl8192cu: Add new ID)
Merging driver-core.current/driver-core-linus (52addcf9d666 Linux 3.17-rc2)
Merging tty.current/tty-linus (52addcf9d666 Linux 3.17-rc2)
Merging usb.current/usb-linus (a9ef803d740b USB: fix build error with 
CONFIG_PM_RUNTIME disabled)
Merging usb-gadget-fixes/fixes (5d19703822da usb: gadget: remove $(PWD) in 
ccflags-y)
Merging usb-serial-fixes/usb-linus (646907f5bfb0 USB: ftdi_sio: Added PID for 
new ekey device)
Merging staging.current/staging-linus (a2fa6721c723 staging: r8188eu: Add new 
USB ID)
Merging char-misc.current/char-misc-linus (72ad366f687d thunderbolt: Clear hops 
before overwriting)
Merging input-current/for-linus (a2418fc4a13b Input: elantech - add support for 
trackpoint found on some v3 models)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" 
stripe)
Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of 
generating multiple of 2**16 bytes)
Merging ide/master (a53dae49b2fe ide: use module_platform_driver())
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree 
fixup machine function)
Merging rr-fixes/fixes (ff7e0055bb5d module: Clean up ro/nx after early module 
load failures)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 
'for-joerg/arm-smmu/fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (bbe1c2740d3a drm/i915: Remove 
bogus __init annotation from DMI callbacks)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for 
nommu)
Merging arc/for-next 

linux-next: Tree for Aug 29

2014-08-28 Thread Stephen Rothwell
Hi all,

I will be on vacation for the next week, so the next linux-next that I
will release will be next-20140908.  Sorry for the inconvenience.

Changes since 20140828:

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

Non-merge commits (relative to Linus' tree): 2327
 2465 files changed, 66838 insertions(+), 40620 deletions(-)



I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use git pull
to do so as that will try to merge the new linux-next release with the
old one.  You should use git fetch and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm
defconfig.

Below is a summary of the state of the merge.

I am currently merging 220 trees (counting Linus' and 30 trees of patches
pending for Linus' tree).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (59753a805499 Merge tag 'backlight-fixes-3.17' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight)
Merging fixes/master (23cf8d3ca0fd powerpc: Fix attempt to move .org 
backwards error)
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
Merging arm-current/fixes (eba1c71819d2 ARM: 8130/1: 
cpuidle/cpuidle-big_little: fix reading cpu id part number)
Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement 
no longer needed)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of 
flash_block_list in rtas_flash)
Merging sparc/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging net/master (7a4cecf74c16 phy: fix EEE checks inside the phy_init_eee.)
Merging ipsec/master (2d39d120781a mvneta: Add missing if_vlan.h include.)
Merging sound-current/for-linus (1a22e7758eab ALSA: hda - Set up initial pins 
for Acer Aspire V5)
Merging pci-current/for-linus (8d7004a6904c PCI: spear: Remove module option)
Merging wireless/master (c66517165610 rtlwifi: rtl8192cu: Add new ID)
Merging driver-core.current/driver-core-linus (52addcf9d666 Linux 3.17-rc2)
Merging tty.current/tty-linus (52addcf9d666 Linux 3.17-rc2)
Merging usb.current/usb-linus (a9ef803d740b USB: fix build error with 
CONFIG_PM_RUNTIME disabled)
Merging usb-gadget-fixes/fixes (5d19703822da usb: gadget: remove $(PWD) in 
ccflags-y)
Merging usb-serial-fixes/usb-linus (646907f5bfb0 USB: ftdi_sio: Added PID for 
new ekey device)
Merging staging.current/staging-linus (a2fa6721c723 staging: r8188eu: Add new 
USB ID)
Merging char-misc.current/char-misc-linus (72ad366f687d thunderbolt: Clear hops 
before overwriting)
Merging input-current/for-linus (a2418fc4a13b Input: elantech - add support for 
trackpoint found on some v3 models)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard 
stripe)
Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of 
generating multiple of 2**16 bytes)
Merging ide/master (a53dae49b2fe ide: use module_platform_driver())
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree 
fixup machine function)
Merging rr-fixes/fixes (ff7e0055bb5d module: Clean up ro/nx after early module 
load failures)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 
'for-joerg/arm-smmu/fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (bbe1c2740d3a drm/i915: Remove 
bogus __init annotation from DMI callbacks)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for 
nommu)
Merging arc/for-next 

linux-next: Tree for Aug 29

2013-08-29 Thread Stephen Rothwell
Hi all,

Changes since 20130828:

Removed tree: memblock (its job was done)

The v4l-dvb tree gained a conflict against Linus' tree.

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

The pinctrl tree gained a conflict against Linus' tree.

The arm-soc tree gained conflicts against the v4l-dvb and pm trees.

The renesas tree gained a conflict against the v4l-dvb tree.

I removed a patch from the akpm tree as the commit it was reverting has
been removed from the selinux tree.



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" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 221 trees (counting Linus' and 30 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (fa8218d Merge tag 'regmap-v3.11-rc7' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1)
Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4)
Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes)
Merging m68k-current/for-linus (ea077b1 m68k: Truncate base in do_div())
Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2)
Merging powerpc-merge/merge (d220980 powerpc/hvsi: Increase handshake timeout 
from 200ms to 400ms.)
Merging sparc/master (63d4996 sparc64: Fix off by one in trampoline TLB mapping 
installation loop.)
Merging net/master (282a1df net: xilinx: fix memleak)
Merging ipsec/master (302a50b xfrm: Fix potential null pointer dereference in 
xdst_queue_output)
Merging sound-current/for-linus (fb61549 ALSA: opti9xx: Fix conflicting driver 
object name)
Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory 
support in PCI-to-PCI bridge)
Merging wireless/master (19c3616 ath9k: Enable PLL fix only for AR9340/AR9330)
Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3)
Merging tty.current/tty-linus (c095ba7 Linux 3.11-rc4)
Merging usb.current/usb-linus (d347404 USB: OHCI: fix build error related to 
ohci_suspend/resume)
Merging staging.current/staging-linus (d8dfad3 Linux 3.11-rc7)
Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6)
Merging input-current/for-linus (ed06349 Input: xpad - add signature for Razer 
Onza Classic Edition)
Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' 
and 'recovery'.)
Merging audit-current/for-linus (c158a35 audit: no leading space in 
audit_log_d_path prefix)
Merging crypto-current/master (e70308e Revert "crypto: crct10dif - Wrap 
crc_t10dif function all to use crypto transform framework")
Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j 
option")
Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to 
inline functions)
Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct 
resource to 0 in of_irq_to_resource())
Merging rr-fixes/fixes (6c2580c Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32)
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work 
without pdata)

linux-next: Tree for Aug 29

2013-08-29 Thread Stephen Rothwell
Hi all,

Changes since 20130828:

Removed tree: memblock (its job was done)

The v4l-dvb tree gained a conflict against Linus' tree.

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

The pinctrl tree gained a conflict against Linus' tree.

The arm-soc tree gained conflicts against the v4l-dvb and pm trees.

The renesas tree gained a conflict against the v4l-dvb tree.

I removed a patch from the akpm tree as the commit it was reverting has
been removed from the selinux tree.



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 as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 221 trees (counting Linus' and 30 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (fa8218d Merge tag 'regmap-v3.11-rc7' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1)
Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4)
Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes)
Merging m68k-current/for-linus (ea077b1 m68k: Truncate base in do_div())
Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2)
Merging powerpc-merge/merge (d220980 powerpc/hvsi: Increase handshake timeout 
from 200ms to 400ms.)
Merging sparc/master (63d4996 sparc64: Fix off by one in trampoline TLB mapping 
installation loop.)
Merging net/master (282a1df net: xilinx: fix memleak)
Merging ipsec/master (302a50b xfrm: Fix potential null pointer dereference in 
xdst_queue_output)
Merging sound-current/for-linus (fb61549 ALSA: opti9xx: Fix conflicting driver 
object name)
Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory 
support in PCI-to-PCI bridge)
Merging wireless/master (19c3616 ath9k: Enable PLL fix only for AR9340/AR9330)
Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3)
Merging tty.current/tty-linus (c095ba7 Linux 3.11-rc4)
Merging usb.current/usb-linus (d347404 USB: OHCI: fix build error related to 
ohci_suspend/resume)
Merging staging.current/staging-linus (d8dfad3 Linux 3.11-rc7)
Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6)
Merging input-current/for-linus (ed06349 Input: xpad - add signature for Razer 
Onza Classic Edition)
Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' 
and 'recovery'.)
Merging audit-current/for-linus (c158a35 audit: no leading space in 
audit_log_d_path prefix)
Merging crypto-current/master (e70308e Revert crypto: crct10dif - Wrap 
crc_t10dif function all to use crypto transform framework)
Merging ide/master (6d128e1 Revert Makefile: Fix install error with make -j 
option)
Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to 
inline functions)
Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct 
resource to 0 in of_irq_to_resource())
Merging rr-fixes/fixes (6c2580c Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32)
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work 
without pdata)
Merging