linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Changes since 20210406:

The keys tree gained a conflict against the integrity tree.

The scsi tree gained a conflict against the scsi-fixes tree.

The akpm-current tree gained a conflict against the block tree.

Non-merge commits (relative to Linus' tree): 9568
 8979 files changed, 503000 insertions(+), 226779 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 htmldocs. 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 335 trees (counting Linus' and 87 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 (2d743660786e Merge branch 'fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2)
Merging kbuild-current/fixes (bcbcf50f5218 kbuild: fix ld-version.sh to not be 
affected by locale)
Merging arc-current/for-curr (83520d62cc5a ARC: treewide: avoid the pointer 
addition with NULL pointer)
Merging arm-current/fixes (30e3b4f256b4 ARM: footbridge: fix PCI interrupt 
mapping)
Merging arm64-fixes/for-next/fixes (185f2e5f51c2 arm64: fix inline asm in 
load_unaligned_zeropad())
Merging arm-soc-fixes/arm/fixes (6bf18bbe1999 Merge tag 'mvebu-fixes-5.12-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes)
Merging drivers-memory-fixes/fixes (a38fd8748464 Linux 5.12-rc2)
Merging m68k-current/for-linus (a65a802aadba m68k: Fix virt_addr_valid() W=1 
compiler warnings)
Merging powerpc-fixes/fixes (791f9e36599d powerpc/vdso: Make sure 
vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt)
Merging s390-fixes/fixes (85012e764d3a s390/irq: fix reading of ext_params2 
field from lowcore)
Merging sparc/master (05a59d79793d Merge 
git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption 
not used on new files)
Merging net/master (08c27f3322fe batman-adv: initialize "struct 
batadv_tvlv_tt_vlan_data"->reserved field)
Merging bpf/master (a14d273ba159 net: macb: restore cmp registers on resume 
path)
Merging ipsec/master (ef19e111337f xfrm/compat: Cleanup WARN()s that can be 
user-triggered)
Merging netfilter/master (fbea31808ca1 netfilter: conntrack: do not print 
icmpv6 as unknown via /proc)
Merging ipvs/master (fbea31808ca1 netfilter: conntrack: do not print icmpv6 as 
unknown via /proc)
Merging wireless-drivers/master (65db391dd874 iwlwifi: mvm: fix beacon 
protection checks)
Merging mac80211/master (6f235a69e594 ch_ktls: fix enum-conversion warning)
Merging rdma-fixes/for-rc (7582207b1059 RDMA/rtrs-clt: Close rtrs client conn 
before destroying rtrs clt session files)
Merging sound-current/for-linus (c6423ed2da62 ALSA: hda/conexant: Apply quirk 
for another HP ZBook G5 model)
Merging sound-asoc-fixes/for-linus (c08d69ae474a Merge remote-tracking branch 
'asoc/for-5.12' into asoc-linus)
Merging regmap-fixes/for-linus (f5148babb3cd Merge remote-tracking branch 
'regmap/for-5.12' into regmap-linus)
Merging regulator-fixes/for-linus (6068cc31dedd Merge remote-tracking branch 
'regulator/for-5.12' into regulator-linus)
Merging spi-fixes/for-linus (aee1cf9f09fa Merge remote-tracking branch 
'spi/for-5.12' into spi-linus)
Merging pci-current/for-linus (cf673bd0cc97 PCI: switchtec: Fix Spectre v1 
vulnerability)
Merging driver-core.current/driver-core-linus (eed6e41813de driver core: Fix 
locking bug in 

Re: linux-next: Tree for Apr 7 (btrfs)

[David Sterba]

On Fri, Apr 07, 2017 at 06:05:02PM +0200, David Sterba wrote:
> On Fri, Apr 07, 2017 at 08:10:48AM -0700, Randy Dunlap wrote:
> > On 04/07/17 08:08, Randy Dunlap wrote:
> > > On 04/07/17 01:27, Stephen Rothwell wrote:
> > >> Hi all,
> > >>
> > >> Changes since 20170406:
> > >>
> > > 
> > > on i386:
> > > 
> > > ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
> > > 
> > > Reported-by: Randy Dunlap 
> > > 
> > 
> > or when built-in:
> > 
> > fs/built-in.o: In function `scrub_bio_end_io_worker':
> > scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
> > fs/built-in.o: In function `scrub_raid56_parity':
> > scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
> > scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
> > scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'
> 
> Sorry, I can't reproduce it here, I've also tried my other for-next
> snapshot branches, same. We have some recent patches that could trigger
> the __udivdi3 build check,
> 
> "Btrfs: update scrub_parity to use u64 stripe_len" (7d0ef8b4dbbd22)
> 
> manual check or with help of coccinell didn't show me any instances of
> 64bit division with / .

Fixed and updated for-next pushed to my k.org repository.

Re: linux-next: Tree for Apr 7 (btrfs)

[David Sterba]

On Fri, Apr 07, 2017 at 06:05:02PM +0200, David Sterba wrote:
> On Fri, Apr 07, 2017 at 08:10:48AM -0700, Randy Dunlap wrote:
> > On 04/07/17 08:08, Randy Dunlap wrote:
> > > On 04/07/17 01:27, Stephen Rothwell wrote:
> > >> Hi all,
> > >>
> > >> Changes since 20170406:
> > >>
> > > 
> > > on i386:
> > > 
> > > ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
> > > 
> > > Reported-by: Randy Dunlap 
> > > 
> > 
> > or when built-in:
> > 
> > fs/built-in.o: In function `scrub_bio_end_io_worker':
> > scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
> > fs/built-in.o: In function `scrub_raid56_parity':
> > scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
> > scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
> > scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'
> 
> Sorry, I can't reproduce it here, I've also tried my other for-next
> snapshot branches, same. We have some recent patches that could trigger
> the __udivdi3 build check,
> 
> "Btrfs: update scrub_parity to use u64 stripe_len" (7d0ef8b4dbbd22)
> 
> manual check or with help of coccinell didn't show me any instances of
> 64bit division with / .

Fixed and updated for-next pushed to my k.org repository.

Re: linux-next: Tree for Apr 7 (btrfs)

[David Sterba]

On Fri, Apr 07, 2017 at 08:10:48AM -0700, Randy Dunlap wrote:
> On 04/07/17 08:08, Randy Dunlap wrote:
> > On 04/07/17 01:27, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Changes since 20170406:
> >>
> > 
> > on i386:
> > 
> > ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
> > 
> > Reported-by: Randy Dunlap 
> > 
> 
> or when built-in:
> 
> fs/built-in.o: In function `scrub_bio_end_io_worker':
> scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
> fs/built-in.o: In function `scrub_raid56_parity':
> scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
> scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
> scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'

Sorry, I can't reproduce it here, I've also tried my other for-next
snapshot branches, same. We have some recent patches that could trigger
the __udivdi3 build check,

"Btrfs: update scrub_parity to use u64 stripe_len" (7d0ef8b4dbbd22)

manual check or with help of coccinell didn't show me any instances of
64bit division with / .

Re: linux-next: Tree for Apr 7 (btrfs)

[David Sterba]

On Fri, Apr 07, 2017 at 08:10:48AM -0700, Randy Dunlap wrote:
> On 04/07/17 08:08, Randy Dunlap wrote:
> > On 04/07/17 01:27, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Changes since 20170406:
> >>
> > 
> > on i386:
> > 
> > ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
> > 
> > Reported-by: Randy Dunlap 
> > 
> 
> or when built-in:
> 
> fs/built-in.o: In function `scrub_bio_end_io_worker':
> scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
> fs/built-in.o: In function `scrub_raid56_parity':
> scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
> scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
> scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'

Sorry, I can't reproduce it here, I've also tried my other for-next
snapshot branches, same. We have some recent patches that could trigger
the __udivdi3 build check,

"Btrfs: update scrub_parity to use u64 stripe_len" (7d0ef8b4dbbd22)

manual check or with help of coccinell didn't show me any instances of
64bit division with / .

Re: linux-next: Tree for Apr 7 (btrfs)

[Randy Dunlap]

On 04/07/17 08:08, Randy Dunlap wrote:
> On 04/07/17 01:27, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20170406:
>>
> 
> on i386:
> 
> ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
> 
> Reported-by: Randy Dunlap 
> 

or when built-in:

fs/built-in.o: In function `scrub_bio_end_io_worker':
scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
fs/built-in.o: In function `scrub_raid56_parity':
scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'


-- 
~Randy

Re: linux-next: Tree for Apr 7 (btrfs)

[Randy Dunlap]

On 04/07/17 08:08, Randy Dunlap wrote:
> On 04/07/17 01:27, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20170406:
>>
> 
> on i386:
> 
> ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
> 
> Reported-by: Randy Dunlap 
> 

or when built-in:

fs/built-in.o: In function `scrub_bio_end_io_worker':
scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
fs/built-in.o: In function `scrub_raid56_parity':
scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'


-- 
~Randy

Re: linux-next: Tree for Apr 7 (btrfs)

[Randy Dunlap]

On 04/07/17 01:27, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20170406:
> 

on i386:

ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!

Reported-by: Randy Dunlap 

-- 
~Randy

Re: linux-next: Tree for Apr 7 (btrfs)

[Randy Dunlap]

On 04/07/17 01:27, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20170406:
> 

on i386:

ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!

Reported-by: Randy Dunlap 

-- 
~Randy

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Changes since 20170406:

The vfs tree gained a conflict against the s390 tree.

The net-next tree gained conflicts against the net and vfs trees

The kvm-ppc tree gained a conflict against the kvm tree and a build
failure for which I reverted 4 commits.

The kvms390 tree gained conflicts against the kvm and kvm-ppc trees.

The mfd tree still had its build failure for which I reverted a commit.

The usb-gadget tree gained conflicts against the usb tree.

The scsi-mkp tree gained a conflict against the char-misc tree.

The akpm tree gained a conflict against the arm64 tree and lost a patch
that turned up elsewhere.

Non-merge commits (relative to Linus' tree): 7906
 7907 files changed, 923252 insertions(+), 161456 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.

Below is a summary of the state of the merge.

I am currently merging 256 trees (counting Linus' and 37 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 (977674c06b18 Merge branch 'upstream' of 
git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading 
parentheses around a condition)
Merging arc-current/for-curr (a71c9a1c779f Linux 4.11-rc5)
Merging arm-current/fixes (35512d971274 Merge branch 'kprobe-fixes' of 
https://git.linaro.org/people/tixy/kernel into fixes)
Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (88b1bf7268f5 powerpc/mm: Add missing global TLB 
invalidate if cxl is active)
Merging sparc/master (86e1066fe2af sparc: remove unused wp_works_ok macro)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and 
linking special files)
Merging net/master (16cf72bb0856 team: call netdev_change_features out of team 
lock)
Merging ipsec/master (89e357d83c06 af_key: Add lock to key dump)
Merging netfilter/master (0b9aefea8600 tcp: minimize false-positives on TCP/GRO 
check)
Merging ipvs/master (0b9aefea8600 tcp: minimize false-positives on TCP/GRO 
check)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype 
avoiding use-after-free of virtual interface)
Merging mac80211/master (75514b665485 net: ethernet: ti: cpsw: wake tx queues 
on ndo_tx_timeout)
Merging sound-current/for-linus (2f726aec19a9 ALSA: hda - fix a problem for 
lineout on a Dell AIO machine)
Merging pci-current/for-linus (794a8604fe6e PCI: dwc: Fix dw_pcie_ops NULL 
pointer dereference)
Merging driver-core.current/driver-core-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging tty.current/tty-linus (a71c9a1c779f Linux 4.11-rc5)
Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5)
Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't 
access hidg->req without spinlock held)
Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move 
the lock initialization to core file)
Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON)
Merging staging.current/staging-linus (a6d361404d81 Merge tag 
'iio-fixes-for-4.11d' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging input-current/for-linus (5659495a7a14 uapi: add missing install of 

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Changes since 20170406:

The vfs tree gained a conflict against the s390 tree.

The net-next tree gained conflicts against the net and vfs trees

The kvm-ppc tree gained a conflict against the kvm tree and a build
failure for which I reverted 4 commits.

The kvms390 tree gained conflicts against the kvm and kvm-ppc trees.

The mfd tree still had its build failure for which I reverted a commit.

The usb-gadget tree gained conflicts against the usb tree.

The scsi-mkp tree gained a conflict against the char-misc tree.

The akpm tree gained a conflict against the arm64 tree and lost a patch
that turned up elsewhere.

Non-merge commits (relative to Linus' tree): 7906
 7907 files changed, 923252 insertions(+), 161456 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.

Below is a summary of the state of the merge.

I am currently merging 256 trees (counting Linus' and 37 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 (977674c06b18 Merge branch 'upstream' of 
git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading 
parentheses around a condition)
Merging arc-current/for-curr (a71c9a1c779f Linux 4.11-rc5)
Merging arm-current/fixes (35512d971274 Merge branch 'kprobe-fixes' of 
https://git.linaro.org/people/tixy/kernel into fixes)
Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (88b1bf7268f5 powerpc/mm: Add missing global TLB 
invalidate if cxl is active)
Merging sparc/master (86e1066fe2af sparc: remove unused wp_works_ok macro)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and 
linking special files)
Merging net/master (16cf72bb0856 team: call netdev_change_features out of team 
lock)
Merging ipsec/master (89e357d83c06 af_key: Add lock to key dump)
Merging netfilter/master (0b9aefea8600 tcp: minimize false-positives on TCP/GRO 
check)
Merging ipvs/master (0b9aefea8600 tcp: minimize false-positives on TCP/GRO 
check)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype 
avoiding use-after-free of virtual interface)
Merging mac80211/master (75514b665485 net: ethernet: ti: cpsw: wake tx queues 
on ndo_tx_timeout)
Merging sound-current/for-linus (2f726aec19a9 ALSA: hda - fix a problem for 
lineout on a Dell AIO machine)
Merging pci-current/for-linus (794a8604fe6e PCI: dwc: Fix dw_pcie_ops NULL 
pointer dereference)
Merging driver-core.current/driver-core-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging tty.current/tty-linus (a71c9a1c779f Linux 4.11-rc5)
Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5)
Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't 
access hidg->req without spinlock held)
Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move 
the lock initialization to core file)
Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON)
Merging staging.current/staging-linus (a6d361404d81 Merge tag 
'iio-fixes-for-4.11d' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging input-current/for-linus (5659495a7a14 uapi: add missing install of 

Re: linux-next: Tree for Apr 7

[Ralf Baechle]

On Thu, Apr 07, 2016 at 04:32:51PM +0530, Sudip Mukherjee wrote:

> My patch at : https://lkml.org/lkml/2016/4/4/236 fixes the build for
> defconfig and allmodconfig. I have not checked the patch with other builds.

This is fixed locally; I just haven't pushed a fresh branch, sorry ...

  Ralf

Re: linux-next: Tree for Apr 7

[Ralf Baechle]

On Thu, Apr 07, 2016 at 04:32:51PM +0530, Sudip Mukherjee wrote:

> My patch at : https://lkml.org/lkml/2016/4/4/236 fixes the build for
> defconfig and allmodconfig. I have not checked the patch with other builds.

This is fixed locally; I just haven't pushed a fresh branch, sorry ...

  Ralf

Re: linux-next: Tree for Apr 7

[Sudip Mukherjee]

On Thursday 07 April 2016 10:59 AM, Stephen Rothwell wrote:

Hi all,

Changes since 20160406:


All the mips builds are failing since last few days.

My patch at : https://lkml.org/lkml/2016/4/4/236 fixes the build for 
defconfig and allmodconfig. I have not checked the patch with other builds.


regards
sudip

Re: linux-next: Tree for Apr 7

[Sudip Mukherjee]

On Thursday 07 April 2016 10:59 AM, Stephen Rothwell wrote:

Hi all,

Changes since 20160406:


All the mips builds are failing since last few days.

My patch at : https://lkml.org/lkml/2016/4/4/236 fixes the build for 
defconfig and allmodconfig. I have not checked the patch with other builds.


regards
sudip

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Changes since 20160406:

The akpm-current tree gained a build failure for which I applied a patch.

Non-merge commits (relative to Linus' tree): 2722
 2566 files changed, 106575 insertions(+), 66077 deletions(-)



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

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

Below is a summary of the state of the merge.

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

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

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

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

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (c4004b02f8e5 x86: remove the kernel code/data/bss 
resources from /proc/iomem)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on 
module install)
Merging arc-current/for-curr (b5cd46412eaa Revert "ARC: [plat-axs10x] add 
Ethernet PHY description in .dts")
Merging arm-current/fixes (0fc03d4c8761 ARM: SMP enable of cache maintanence 
broadcast)
Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in 
comments.)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached 
build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (0a1a37b6d62e net: add the AF_KCM entries to family name 
tables)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID 
header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 
'iwlwifi-for-kalle-2016-03-30' of 
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (b4201cc4fc6e mac80211: fix "warning: ‘target_metric’ 
may be used uninitialized")
Merging sound-current/for-linus (f03b24a851d3 ALSA: usb-audio: Add a sample 
rate quirk for Phoenix Audio TMX320)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for 
active-low reset GPIO")
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor 
tty_open()")
Merging usb.current/usb-linus (5a07975ad0a3 USB: digi_acceleport: do sanity 
checking for the number of ports)
Merging usb-gadget-fixes/fixes (adf9a3ab90eb usb: dwc3: keystone: drop dma_mask 
configuration)
Merging usb-serial-fixes/usb-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: 
change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: 
Remove obsolete driver")
Merging char-misc.current/char-misc-linus (1bb025f6db78 Merge tag 
'extcon-fixes-for-4.6-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into 
char-misc-linus)
Merging input-current/for-linus (7eb5ca09e48e Input: clarify we want 
BTN_TOOL_ on proximity)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree 
compilation)
Merging ide/master (1993b176a822 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test 
for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms 
vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging 

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Changes since 20160406:

The akpm-current tree gained a build failure for which I applied a patch.

Non-merge commits (relative to Linus' tree): 2722
 2566 files changed, 106575 insertions(+), 66077 deletions(-)



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

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

Below is a summary of the state of the merge.

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

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

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

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

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (c4004b02f8e5 x86: remove the kernel code/data/bss 
resources from /proc/iomem)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on 
module install)
Merging arc-current/for-curr (b5cd46412eaa Revert "ARC: [plat-axs10x] add 
Ethernet PHY description in .dts")
Merging arm-current/fixes (0fc03d4c8761 ARM: SMP enable of cache maintanence 
broadcast)
Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in 
comments.)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached 
build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (0a1a37b6d62e net: add the AF_KCM entries to family name 
tables)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID 
header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 
'iwlwifi-for-kalle-2016-03-30' of 
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (b4201cc4fc6e mac80211: fix "warning: ‘target_metric’ 
may be used uninitialized")
Merging sound-current/for-linus (f03b24a851d3 ALSA: usb-audio: Add a sample 
rate quirk for Phoenix Audio TMX320)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for 
active-low reset GPIO")
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor 
tty_open()")
Merging usb.current/usb-linus (5a07975ad0a3 USB: digi_acceleport: do sanity 
checking for the number of ports)
Merging usb-gadget-fixes/fixes (adf9a3ab90eb usb: dwc3: keystone: drop dma_mask 
configuration)
Merging usb-serial-fixes/usb-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: 
change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: 
Remove obsolete driver")
Merging char-misc.current/char-misc-linus (1bb025f6db78 Merge tag 
'extcon-fixes-for-4.6-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into 
char-misc-linus)
Merging input-current/for-linus (7eb5ca09e48e Input: clarify we want 
BTN_TOOL_ on proximity)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree 
compilation)
Merging ide/master (1993b176a822 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test 
for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms 
vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging 

Re: linux-next: Tree for Apr 7 (build failure: mips:bcm63xx_defconfig)

[Florian Fainelli]

On 07/04/15 10:16, Guenter Roeck wrote:
> On Tue, Apr 07, 2015 at 10:08:08PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20150402:
>>
>> The arm-soc tree gained a build failure for which I reverted a commit.
>>
>> The omap tree gained a build failure for which I applied a merge fix
>> patch.
>>
>> The arm64 tree gained a conflict against the arm-soc tree.
>>
>> The net-next tree gained conflicts against the net tree.
>>
>> The vfs tree gained conflicts against the ext4 and v9fs trees.
>>
>> The drm tree gained a conflict against Linus' tree.
>>
>> The spi tree gained a build failure so I used the version from
>> next-20150402.
>>
>> The tip tree gained conflicts against the net-next tree and a build
>> failure so I used the version from next-20150402.
>>
>> The kvm tree gained a conflict against the mips tree.
>>
>> The kvms390 tree gained a conflict against the kvm tree.
>>
>> The tty tree gained a conflict against the slave-dma tree.
>>
>> The akpm-current tree gained conflicts against the tile tree.  I also
>> removed a patch as requested due to reported failures.
>>
>> Non-merge commits (relative to Linus' tree): 8802
>>  7861 files changed, 364548 insertions(+), 179283 deletions(-)
>>
>> 
>>
> 
> Building mips:bcm63xx_defconfig ... failed
> --
> Error log:
> mm/page_alloc.c: In function 'free_area_init_nodes':
> mm/page_alloc.c:5412:34: warning: array subscript is below array bounds 
> [-Warray-bounds]
> arch/mips/built-in.o: In function `mips_dma_sync_single_for_device':
> dma-default.c:(.text+0xf644): undefined reference to `plat_dma_addr_to_phys'
> arch/mips/built-in.o: In function `mips_dma_map_sg':
> dma-default.c:(.text+0xf7bc): undefined reference to `plat_map_dma_mem_page'
> arch/mips/built-in.o: In function `mips_dma_map_page':
> dma-default.c:(.text+0xf8ac): undefined reference to `plat_map_dma_mem_page'
> dma-default.c:(.text+0xf8f0): undefined reference to `plat_map_dma_mem_page'
> dma-default.c:(.text+0xf924): undefined reference to `plat_map_dma_mem_page'
> arch/mips/built-in.o: In function `mips_dma_alloc_coherent':
> dma-default.c:(.text+0xfbbc): undefined reference to `plat_map_dma_mem'
> arch/mips/built-in.o: In function `dma_alloc_noncoherent':
> (.text+0xfce8): undefined reference to `plat_map_dma_mem'
> make: *** [vmlinux] Error 1
> 
> Bisect results:
> 
> # bad: [44bf159dfed5558083f97d792cb4bebdbcbf3061] Add linux-next specific 
> files for 20150407
> # good: [f22e6e847115abc3a0e2ad7bb18d243d42275af1] Linux 4.0-rc7
> git bisect start 'HEAD' 'v4.0-rc7'
> # bad: [16e2e34a62e94f3ab00e8db509529c77eeb031ea] Merge remote-tracking 
> branch 'drm/drm-next'
> git bisect bad 16e2e34a62e94f3ab00e8db509529c77eeb031ea
> # bad: [fefe503874f0113d582056b8bb392baeda5f4f19] Merge remote-tracking 
> branch 'file-locks/linux-next'
> git bisect bad fefe503874f0113d582056b8bb392baeda5f4f19
> # good: [e5a6058af54727023a6e1765fd167ca4ae1782eb] Merge remote-tracking 
> branch 'samsung/for-next'
> git bisect good e5a6058af54727023a6e1765fd167ca4ae1782eb
> # bad: [084998d2aa97730be0b322c4c46a14c2f909e975] Merge remote-tracking 
> branch 'mips/mips-for-linux-next'
> git bisect bad 084998d2aa97730be0b322c4c46a14c2f909e975
> # bad: [c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3] Merge branch '4.1-fp' into 
> mips-for-linux-next
> git bisect bad c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3
> # good: [f45e388ff0f90b922b77bef959a2cfb0645cffbe] MIPS: Provide fallback 
> reboot/poweroff/halt implementations
> git bisect good f45e388ff0f90b922b77bef959a2cfb0645cffbe
> # bad: [635c7028b7b07e7c632ecb841795e43fb375ee7e] MIPS: mipsregs.h: Remove 
> broken comments
> git bisect bad 635c7028b7b07e7c632ecb841795e43fb375ee7e
> # good: [b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b] MIPS: Octeon: Set 
> appropriate endianness in L2C registers
> git bisect good b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b
> # good: [1f8d271385d542796ab7917692908beef10acdc9] MIPS: Lasat: Remove unused 
> function from sysctl code.
> git bisect good 1f8d271385d542796ab7917692908beef10acdc9
> # good: [9d4b5b9e869677154bc5dd27f9cb57c8141deca5] MIPS: SEAD3: sead3-net is 
> not a module.
> git bisect good 9d4b5b9e869677154bc5dd27f9cb57c8141deca5
> # good: [612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd] MIPS: SEAD3: Combine all 
> platform device registrations in one file.
> git bisect good 612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd
> # bad: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: Utilize 
> bmips-dma-coherence.h
> git bisect bad 6fb7566baa012b66b0c58df7df794922b2c6f030
> # good: [0c8741360c66a68314e2ce60d0701d57d44fde71] MIPS: BMIPS: Create 
> bmips-dma-coherence.h
> git bisect good 0c8741360c66a68314e2ce60d0701d57d44fde71
> # first bad commit: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: 
> Utilize bmips-dma-coherence.h
> 
> Reverting commit 6fb7566baa012 fixes the problem.

I could reproduce that on mips-for-linux-next, looking into 

Re: linux-next: Tree for Apr 7 (build failure: mips:bcm63xx_defconfig)

[Guenter Roeck]

On Tue, Apr 07, 2015 at 10:08:08PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20150402:
> 
> The arm-soc tree gained a build failure for which I reverted a commit.
> 
> The omap tree gained a build failure for which I applied a merge fix
> patch.
> 
> The arm64 tree gained a conflict against the arm-soc tree.
> 
> The net-next tree gained conflicts against the net tree.
> 
> The vfs tree gained conflicts against the ext4 and v9fs trees.
> 
> The drm tree gained a conflict against Linus' tree.
> 
> The spi tree gained a build failure so I used the version from
> next-20150402.
> 
> The tip tree gained conflicts against the net-next tree and a build
> failure so I used the version from next-20150402.
> 
> The kvm tree gained a conflict against the mips tree.
> 
> The kvms390 tree gained a conflict against the kvm tree.
> 
> The tty tree gained a conflict against the slave-dma tree.
> 
> The akpm-current tree gained conflicts against the tile tree.  I also
> removed a patch as requested due to reported failures.
> 
> Non-merge commits (relative to Linus' tree): 8802
>  7861 files changed, 364548 insertions(+), 179283 deletions(-)
> 
> 
> 

Building mips:bcm63xx_defconfig ... failed
--
Error log:
mm/page_alloc.c: In function 'free_area_init_nodes':
mm/page_alloc.c:5412:34: warning: array subscript is below array bounds 
[-Warray-bounds]
arch/mips/built-in.o: In function `mips_dma_sync_single_for_device':
dma-default.c:(.text+0xf644): undefined reference to `plat_dma_addr_to_phys'
arch/mips/built-in.o: In function `mips_dma_map_sg':
dma-default.c:(.text+0xf7bc): undefined reference to `plat_map_dma_mem_page'
arch/mips/built-in.o: In function `mips_dma_map_page':
dma-default.c:(.text+0xf8ac): undefined reference to `plat_map_dma_mem_page'
dma-default.c:(.text+0xf8f0): undefined reference to `plat_map_dma_mem_page'
dma-default.c:(.text+0xf924): undefined reference to `plat_map_dma_mem_page'
arch/mips/built-in.o: In function `mips_dma_alloc_coherent':
dma-default.c:(.text+0xfbbc): undefined reference to `plat_map_dma_mem'
arch/mips/built-in.o: In function `dma_alloc_noncoherent':
(.text+0xfce8): undefined reference to `plat_map_dma_mem'
make: *** [vmlinux] Error 1

Bisect results:

# bad: [44bf159dfed5558083f97d792cb4bebdbcbf3061] Add linux-next specific files 
for 20150407
# good: [f22e6e847115abc3a0e2ad7bb18d243d42275af1] Linux 4.0-rc7
git bisect start 'HEAD' 'v4.0-rc7'
# bad: [16e2e34a62e94f3ab00e8db509529c77eeb031ea] Merge remote-tracking branch 
'drm/drm-next'
git bisect bad 16e2e34a62e94f3ab00e8db509529c77eeb031ea
# bad: [fefe503874f0113d582056b8bb392baeda5f4f19] Merge remote-tracking branch 
'file-locks/linux-next'
git bisect bad fefe503874f0113d582056b8bb392baeda5f4f19
# good: [e5a6058af54727023a6e1765fd167ca4ae1782eb] Merge remote-tracking branch 
'samsung/for-next'
git bisect good e5a6058af54727023a6e1765fd167ca4ae1782eb
# bad: [084998d2aa97730be0b322c4c46a14c2f909e975] Merge remote-tracking branch 
'mips/mips-for-linux-next'
git bisect bad 084998d2aa97730be0b322c4c46a14c2f909e975
# bad: [c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3] Merge branch '4.1-fp' into 
mips-for-linux-next
git bisect bad c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3
# good: [f45e388ff0f90b922b77bef959a2cfb0645cffbe] MIPS: Provide fallback 
reboot/poweroff/halt implementations
git bisect good f45e388ff0f90b922b77bef959a2cfb0645cffbe
# bad: [635c7028b7b07e7c632ecb841795e43fb375ee7e] MIPS: mipsregs.h: Remove 
broken comments
git bisect bad 635c7028b7b07e7c632ecb841795e43fb375ee7e
# good: [b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b] MIPS: Octeon: Set 
appropriate endianness in L2C registers
git bisect good b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b
# good: [1f8d271385d542796ab7917692908beef10acdc9] MIPS: Lasat: Remove unused 
function from sysctl code.
git bisect good 1f8d271385d542796ab7917692908beef10acdc9
# good: [9d4b5b9e869677154bc5dd27f9cb57c8141deca5] MIPS: SEAD3: sead3-net is 
not a module.
git bisect good 9d4b5b9e869677154bc5dd27f9cb57c8141deca5
# good: [612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd] MIPS: SEAD3: Combine all 
platform device registrations in one file.
git bisect good 612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd
# bad: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: Utilize 
bmips-dma-coherence.h
git bisect bad 6fb7566baa012b66b0c58df7df794922b2c6f030
# good: [0c8741360c66a68314e2ce60d0701d57d44fde71] MIPS: BMIPS: Create 
bmips-dma-coherence.h
git bisect good 0c8741360c66a68314e2ce60d0701d57d44fde71
# first bad commit: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: 
Utilize bmips-dma-coherence.h

Reverting commit 6fb7566baa012 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/

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Changes since 20150402:

The arm-soc tree gained a build failure for which I reverted a commit.

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

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

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

The vfs tree gained conflicts against the ext4 and v9fs trees.

The drm tree gained a conflict against Linus' tree.

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

The tip tree gained conflicts against the net-next tree and a build
failure so I used the version from next-20150402.

The kvm tree gained a conflict against the mips tree.

The kvms390 tree gained a conflict against the kvm tree.

The tty tree gained a conflict against the slave-dma tree.

The akpm-current tree gained conflicts against the tile tree.  I also
removed a patch as requested due to reported failures.

Non-merge commits (relative to Linus' tree): 8802
 7861 files changed, 364548 insertions(+), 179283 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 213 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 (f22e6e847115 Linux 4.0-rc7)
Merging fixes/master (b94d525e58dc Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1)
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
Merging arm-current/fixes (b0557b437f38 ARM: vexpress: fix CPU hotplug with 
CT9x4 tile.)
Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet 
bridging)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached 
build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1)
Merging powerpc-merge-mpe/fixes (1cced5015b17 Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sparc/master (90a5a895cc8b Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (fde913e25496 net/mlx4_core: Fix error message deprecation 
for ConnectX-2 cards)
Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in 
xfrm_lookup())
Merging sound-current/for-linus (9fc88ad6fd86 ALSA: usb-audio: don't try to get 
Benchmark DAC1 sample rate)
Merging pci-current/for-linus (bc3b5b47c80d PCI: cpcihp: Add missing curly 
braces in cpci_configure_slot())
Merging wireless-drivers/master (69628cd0652a Merge tag 
'iwlwifi-for-kalle-2015-03-30' of 
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging driver-core.current/driver-core-linus (bc465aa9d045 Linux 4.0-rc5)
Merging tty.current/tty-linus (8e4934c6d6c6 tty: serial: fsl_lpuart: clear 
receive flag on FIFO flush)
Merging usb.current/usb-linus (d3a3d28f1c7e Merge tag 'usb-serial-4.0-rc6' of 
git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (65582a7f4ce5 usb: isp1760: fix spin unlock in 
the error path of isp1760_udc_start)
Merging usb-serial-fixes/usb-linus (b229a0f840f7 USB: ftdi_sio: Use jtag quirk 
for SNAP Connect E10)
Merging staging.current/staging-linus (dce5bdfe8fc1 Merge tag 
'iio-fixes-for-4.0d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio 
into staging-linus)
Merging char-misc.current/char-misc-linus (bc465aa9d045 Linux 4.0-rc5)
Merging input-current/for-linus 

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Changes since 20150402:

The arm-soc tree gained a build failure for which I reverted a commit.

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

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

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

The vfs tree gained conflicts against the ext4 and v9fs trees.

The drm tree gained a conflict against Linus' tree.

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

The tip tree gained conflicts against the net-next tree and a build
failure so I used the version from next-20150402.

The kvm tree gained a conflict against the mips tree.

The kvms390 tree gained a conflict against the kvm tree.

The tty tree gained a conflict against the slave-dma tree.

The akpm-current tree gained conflicts against the tile tree.  I also
removed a patch as requested due to reported failures.

Non-merge commits (relative to Linus' tree): 8802
 7861 files changed, 364548 insertions(+), 179283 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 213 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 (f22e6e847115 Linux 4.0-rc7)
Merging fixes/master (b94d525e58dc Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1)
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
Merging arm-current/fixes (b0557b437f38 ARM: vexpress: fix CPU hotplug with 
CT9x4 tile.)
Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet 
bridging)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached 
build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1)
Merging powerpc-merge-mpe/fixes (1cced5015b17 Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sparc/master (90a5a895cc8b Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (fde913e25496 net/mlx4_core: Fix error message deprecation 
for ConnectX-2 cards)
Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in 
xfrm_lookup())
Merging sound-current/for-linus (9fc88ad6fd86 ALSA: usb-audio: don't try to get 
Benchmark DAC1 sample rate)
Merging pci-current/for-linus (bc3b5b47c80d PCI: cpcihp: Add missing curly 
braces in cpci_configure_slot())
Merging wireless-drivers/master (69628cd0652a Merge tag 
'iwlwifi-for-kalle-2015-03-30' of 
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging driver-core.current/driver-core-linus (bc465aa9d045 Linux 4.0-rc5)
Merging tty.current/tty-linus (8e4934c6d6c6 tty: serial: fsl_lpuart: clear 
receive flag on FIFO flush)
Merging usb.current/usb-linus (d3a3d28f1c7e Merge tag 'usb-serial-4.0-rc6' of 
git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (65582a7f4ce5 usb: isp1760: fix spin unlock in 
the error path of isp1760_udc_start)
Merging usb-serial-fixes/usb-linus (b229a0f840f7 USB: ftdi_sio: Use jtag quirk 
for SNAP Connect E10)
Merging staging.current/staging-linus (dce5bdfe8fc1 Merge tag 
'iio-fixes-for-4.0d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio 
into staging-linus)
Merging char-misc.current/char-misc-linus (bc465aa9d045 Linux 4.0-rc5)
Merging input-current/for-linus 

Re: linux-next: Tree for Apr 7 (build failure: mips:bcm63xx_defconfig)

[Florian Fainelli]

On 07/04/15 10:16, Guenter Roeck wrote:
 On Tue, Apr 07, 2015 at 10:08:08PM +1000, Stephen Rothwell wrote:
 Hi all,

 Changes since 20150402:

 The arm-soc tree gained a build failure for which I reverted a commit.

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

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

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

 The vfs tree gained conflicts against the ext4 and v9fs trees.

 The drm tree gained a conflict against Linus' tree.

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

 The tip tree gained conflicts against the net-next tree and a build
 failure so I used the version from next-20150402.

 The kvm tree gained a conflict against the mips tree.

 The kvms390 tree gained a conflict against the kvm tree.

 The tty tree gained a conflict against the slave-dma tree.

 The akpm-current tree gained conflicts against the tile tree.  I also
 removed a patch as requested due to reported failures.

 Non-merge commits (relative to Linus' tree): 8802
  7861 files changed, 364548 insertions(+), 179283 deletions(-)

 

 
 Building mips:bcm63xx_defconfig ... failed
 --
 Error log:
 mm/page_alloc.c: In function 'free_area_init_nodes':
 mm/page_alloc.c:5412:34: warning: array subscript is below array bounds 
 [-Warray-bounds]
 arch/mips/built-in.o: In function `mips_dma_sync_single_for_device':
 dma-default.c:(.text+0xf644): undefined reference to `plat_dma_addr_to_phys'
 arch/mips/built-in.o: In function `mips_dma_map_sg':
 dma-default.c:(.text+0xf7bc): undefined reference to `plat_map_dma_mem_page'
 arch/mips/built-in.o: In function `mips_dma_map_page':
 dma-default.c:(.text+0xf8ac): undefined reference to `plat_map_dma_mem_page'
 dma-default.c:(.text+0xf8f0): undefined reference to `plat_map_dma_mem_page'
 dma-default.c:(.text+0xf924): undefined reference to `plat_map_dma_mem_page'
 arch/mips/built-in.o: In function `mips_dma_alloc_coherent':
 dma-default.c:(.text+0xfbbc): undefined reference to `plat_map_dma_mem'
 arch/mips/built-in.o: In function `dma_alloc_noncoherent':
 (.text+0xfce8): undefined reference to `plat_map_dma_mem'
 make: *** [vmlinux] Error 1
 
 Bisect results:
 
 # bad: [44bf159dfed5558083f97d792cb4bebdbcbf3061] Add linux-next specific 
 files for 20150407
 # good: [f22e6e847115abc3a0e2ad7bb18d243d42275af1] Linux 4.0-rc7
 git bisect start 'HEAD' 'v4.0-rc7'
 # bad: [16e2e34a62e94f3ab00e8db509529c77eeb031ea] Merge remote-tracking 
 branch 'drm/drm-next'
 git bisect bad 16e2e34a62e94f3ab00e8db509529c77eeb031ea
 # bad: [fefe503874f0113d582056b8bb392baeda5f4f19] Merge remote-tracking 
 branch 'file-locks/linux-next'
 git bisect bad fefe503874f0113d582056b8bb392baeda5f4f19
 # good: [e5a6058af54727023a6e1765fd167ca4ae1782eb] Merge remote-tracking 
 branch 'samsung/for-next'
 git bisect good e5a6058af54727023a6e1765fd167ca4ae1782eb
 # bad: [084998d2aa97730be0b322c4c46a14c2f909e975] Merge remote-tracking 
 branch 'mips/mips-for-linux-next'
 git bisect bad 084998d2aa97730be0b322c4c46a14c2f909e975
 # bad: [c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3] Merge branch '4.1-fp' into 
 mips-for-linux-next
 git bisect bad c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3
 # good: [f45e388ff0f90b922b77bef959a2cfb0645cffbe] MIPS: Provide fallback 
 reboot/poweroff/halt implementations
 git bisect good f45e388ff0f90b922b77bef959a2cfb0645cffbe
 # bad: [635c7028b7b07e7c632ecb841795e43fb375ee7e] MIPS: mipsregs.h: Remove 
 broken comments
 git bisect bad 635c7028b7b07e7c632ecb841795e43fb375ee7e
 # good: [b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b] MIPS: Octeon: Set 
 appropriate endianness in L2C registers
 git bisect good b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b
 # good: [1f8d271385d542796ab7917692908beef10acdc9] MIPS: Lasat: Remove unused 
 function from sysctl code.
 git bisect good 1f8d271385d542796ab7917692908beef10acdc9
 # good: [9d4b5b9e869677154bc5dd27f9cb57c8141deca5] MIPS: SEAD3: sead3-net is 
 not a module.
 git bisect good 9d4b5b9e869677154bc5dd27f9cb57c8141deca5
 # good: [612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd] MIPS: SEAD3: Combine all 
 platform device registrations in one file.
 git bisect good 612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd
 # bad: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: Utilize 
 bmips-dma-coherence.h
 git bisect bad 6fb7566baa012b66b0c58df7df794922b2c6f030
 # good: [0c8741360c66a68314e2ce60d0701d57d44fde71] MIPS: BMIPS: Create 
 bmips-dma-coherence.h
 git bisect good 0c8741360c66a68314e2ce60d0701d57d44fde71
 # first bad commit: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: 
 Utilize bmips-dma-coherence.h
 
 Reverting commit 6fb7566baa012 fixes the problem.

I could reproduce that on mips-for-linux-next, looking into it now.

Thanks!
-- 
Florian
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to 

Re: linux-next: Tree for Apr 7 (build failure: mips:bcm63xx_defconfig)

[Guenter Roeck]

On Tue, Apr 07, 2015 at 10:08:08PM +1000, Stephen Rothwell wrote:
 Hi all,
 
 Changes since 20150402:
 
 The arm-soc tree gained a build failure for which I reverted a commit.
 
 The omap tree gained a build failure for which I applied a merge fix
 patch.
 
 The arm64 tree gained a conflict against the arm-soc tree.
 
 The net-next tree gained conflicts against the net tree.
 
 The vfs tree gained conflicts against the ext4 and v9fs trees.
 
 The drm tree gained a conflict against Linus' tree.
 
 The spi tree gained a build failure so I used the version from
 next-20150402.
 
 The tip tree gained conflicts against the net-next tree and a build
 failure so I used the version from next-20150402.
 
 The kvm tree gained a conflict against the mips tree.
 
 The kvms390 tree gained a conflict against the kvm tree.
 
 The tty tree gained a conflict against the slave-dma tree.
 
 The akpm-current tree gained conflicts against the tile tree.  I also
 removed a patch as requested due to reported failures.
 
 Non-merge commits (relative to Linus' tree): 8802
  7861 files changed, 364548 insertions(+), 179283 deletions(-)
 
 
 

Building mips:bcm63xx_defconfig ... failed
--
Error log:
mm/page_alloc.c: In function 'free_area_init_nodes':
mm/page_alloc.c:5412:34: warning: array subscript is below array bounds 
[-Warray-bounds]
arch/mips/built-in.o: In function `mips_dma_sync_single_for_device':
dma-default.c:(.text+0xf644): undefined reference to `plat_dma_addr_to_phys'
arch/mips/built-in.o: In function `mips_dma_map_sg':
dma-default.c:(.text+0xf7bc): undefined reference to `plat_map_dma_mem_page'
arch/mips/built-in.o: In function `mips_dma_map_page':
dma-default.c:(.text+0xf8ac): undefined reference to `plat_map_dma_mem_page'
dma-default.c:(.text+0xf8f0): undefined reference to `plat_map_dma_mem_page'
dma-default.c:(.text+0xf924): undefined reference to `plat_map_dma_mem_page'
arch/mips/built-in.o: In function `mips_dma_alloc_coherent':
dma-default.c:(.text+0xfbbc): undefined reference to `plat_map_dma_mem'
arch/mips/built-in.o: In function `dma_alloc_noncoherent':
(.text+0xfce8): undefined reference to `plat_map_dma_mem'
make: *** [vmlinux] Error 1

Bisect results:

# bad: [44bf159dfed5558083f97d792cb4bebdbcbf3061] Add linux-next specific files 
for 20150407
# good: [f22e6e847115abc3a0e2ad7bb18d243d42275af1] Linux 4.0-rc7
git bisect start 'HEAD' 'v4.0-rc7'
# bad: [16e2e34a62e94f3ab00e8db509529c77eeb031ea] Merge remote-tracking branch 
'drm/drm-next'
git bisect bad 16e2e34a62e94f3ab00e8db509529c77eeb031ea
# bad: [fefe503874f0113d582056b8bb392baeda5f4f19] Merge remote-tracking branch 
'file-locks/linux-next'
git bisect bad fefe503874f0113d582056b8bb392baeda5f4f19
# good: [e5a6058af54727023a6e1765fd167ca4ae1782eb] Merge remote-tracking branch 
'samsung/for-next'
git bisect good e5a6058af54727023a6e1765fd167ca4ae1782eb
# bad: [084998d2aa97730be0b322c4c46a14c2f909e975] Merge remote-tracking branch 
'mips/mips-for-linux-next'
git bisect bad 084998d2aa97730be0b322c4c46a14c2f909e975
# bad: [c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3] Merge branch '4.1-fp' into 
mips-for-linux-next
git bisect bad c1382bfac2628d24b9e9a0a9b8a7b2b35b1311c3
# good: [f45e388ff0f90b922b77bef959a2cfb0645cffbe] MIPS: Provide fallback 
reboot/poweroff/halt implementations
git bisect good f45e388ff0f90b922b77bef959a2cfb0645cffbe
# bad: [635c7028b7b07e7c632ecb841795e43fb375ee7e] MIPS: mipsregs.h: Remove 
broken comments
git bisect bad 635c7028b7b07e7c632ecb841795e43fb375ee7e
# good: [b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b] MIPS: Octeon: Set 
appropriate endianness in L2C registers
git bisect good b0abf36ffdc2b7efbb74e02b9dad99b40e85ec3b
# good: [1f8d271385d542796ab7917692908beef10acdc9] MIPS: Lasat: Remove unused 
function from sysctl code.
git bisect good 1f8d271385d542796ab7917692908beef10acdc9
# good: [9d4b5b9e869677154bc5dd27f9cb57c8141deca5] MIPS: SEAD3: sead3-net is 
not a module.
git bisect good 9d4b5b9e869677154bc5dd27f9cb57c8141deca5
# good: [612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd] MIPS: SEAD3: Combine all 
platform device registrations in one file.
git bisect good 612544fbde1b3cf60eb1c06ce1b6640c5d61bcdd
# bad: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: Utilize 
bmips-dma-coherence.h
git bisect bad 6fb7566baa012b66b0c58df7df794922b2c6f030
# good: [0c8741360c66a68314e2ce60d0701d57d44fde71] MIPS: BMIPS: Create 
bmips-dma-coherence.h
git bisect good 0c8741360c66a68314e2ce60d0701d57d44fde71
# first bad commit: [6fb7566baa012b66b0c58df7df794922b2c6f030] MIPS: BCM63xx: 
Utilize bmips-dma-coherence.h

Reverting commit 6fb7566baa012 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/

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Please do not add material intended for v3.16 to your linux-next included
branches until after v3.15-rc1 is released.

This tree still fails (more than usual) the powerpc allyesconfig build.

Changes since 20140403:

Dropped trees: akpm-current, akpm (too complex conflicts)

Removed tree: compat (at maintainer's request)

The powerpc tree still had its build failure.

The arm-soc tree gained conflicts against Linus' tree.

The akpm-current tree gained conflicts against Linus' tree.

Non-merge commits (relative to Linus' tree): 6953
 5823 files changed, 295072 insertions(+), 116620 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" 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 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 213 trees (counting Linus' and 28 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.

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 Rothwell 

$ git checkout master
$ git reset --hard stable
Merging origin/master (18a1a7a1d862 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
Merging arc-current/for-curr (61fb4bfc010b ARC: [nsimosci] Unbork console)
Merging arm-current/fixes (95c52fe06335 ARM: 8007/1: Remove extraneous kcmp 
syscall ignore)
Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for 
v3.14-rc1)
Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5)
Merging powerpc-merge/merge (ece980ff6de6 powerpc/book3s: Fix CFAR clobbering 
issue in machine check handler.)
Merging sparc/master (455c6fdbd219 Linux 3.14)
Merging net/master (d80e773f16f6 Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipsec/master (3e3d35402140 ATHEROS-ATL1E: Convert iounmap to 
pci_iounmap)
Merging sound-current/for-linus (3af5d0524aac sound/oss: Remove uncompilable 
DBG macro use)
Merging pci-current/for-linus (707d4eefbdb3 Revert "[PATCH] Insert GART region 
into resource map")
Merging wireless/master (584221918925 Revert "rt2x00: rt2800lib: Update BBP 
register initialization for RT53xx")
Merging driver-core.current/driver-core-linus (b33ce4429938 Merge branch 
'for-3.15/drivers' of git://git.kernel.dk/linux-block)
Merging tty.current/tty-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of 
git://git.kernel.dk/linux-block)
Merging usb.current/usb-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of 
git://git.kernel.dk/linux-block)
Merging staging.current/staging-linus (8e0c0832348c Merge tag 'fbdev-main-3.15' 
of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux)
Merging char-misc.current/char-misc-linus (b33ce4429938 Merge branch 
'for-3.15/drivers' of git://git.kernel.dk/linux-block)
Merging input-current/for-linus (692d96552c9a Merge branch 'next' into 
for-linus)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" 
stripe)
Merging crypto-current/master (8ceee72808d1 crypto: ghash-clmulni-intel - use C 
implementation for setkey())
Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test for 
of_match_node())
Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter 
kernel symbols for arm)
Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before 
cancelling delayed works)
Merging 

linux-next: Tree for Apr 7

[Stephen Rothwell]

Hi all,

Please do not add material intended for v3.16 to your linux-next included
branches until after v3.15-rc1 is released.

This tree still fails (more than usual) the powerpc allyesconfig build.

Changes since 20140403:

Dropped trees: akpm-current, akpm (too complex conflicts)

Removed tree: compat (at maintainer's request)

The powerpc tree still had its build failure.

The arm-soc tree gained conflicts against Linus' tree.

The akpm-current tree gained conflicts against Linus' tree.

Non-merge commits (relative to Linus' tree): 6953
 5823 files changed, 295072 insertions(+), 116620 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 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 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 213 trees (counting Linus' and 28 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.

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

$ git checkout master
$ git reset --hard stable
Merging origin/master (18a1a7a1d862 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
Merging arc-current/for-curr (61fb4bfc010b ARC: [nsimosci] Unbork console)
Merging arm-current/fixes (95c52fe06335 ARM: 8007/1: Remove extraneous kcmp 
syscall ignore)
Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for 
v3.14-rc1)
Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5)
Merging powerpc-merge/merge (ece980ff6de6 powerpc/book3s: Fix CFAR clobbering 
issue in machine check handler.)
Merging sparc/master (455c6fdbd219 Linux 3.14)
Merging net/master (d80e773f16f6 Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipsec/master (3e3d35402140 ATHEROS-ATL1E: Convert iounmap to 
pci_iounmap)
Merging sound-current/for-linus (3af5d0524aac sound/oss: Remove uncompilable 
DBG macro use)
Merging pci-current/for-linus (707d4eefbdb3 Revert [PATCH] Insert GART region 
into resource map)
Merging wireless/master (584221918925 Revert rt2x00: rt2800lib: Update BBP 
register initialization for RT53xx)
Merging driver-core.current/driver-core-linus (b33ce4429938 Merge branch 
'for-3.15/drivers' of git://git.kernel.dk/linux-block)
Merging tty.current/tty-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of 
git://git.kernel.dk/linux-block)
Merging usb.current/usb-linus (b33ce4429938 Merge branch 'for-3.15/drivers' of 
git://git.kernel.dk/linux-block)
Merging staging.current/staging-linus (8e0c0832348c Merge tag 'fbdev-main-3.15' 
of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux)
Merging char-misc.current/char-misc-linus (b33ce4429938 Merge branch 
'for-3.15/drivers' of git://git.kernel.dk/linux-block)
Merging input-current/for-linus (692d96552c9a Merge branch 'next' into 
for-linus)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard 
stripe)
Merging crypto-current/master (8ceee72808d1 crypto: ghash-clmulni-intel - use C 
implementation for setkey())
Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test for 
of_match_node())
Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter 
kernel symbols for arm)
Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before 
cancelling delayed works)
Merging