Re: linux-next: Tree for Jul 22 (drivers/net/vrf)
On 7/22/20 10:35 AM, Randy Dunlap wrote: > On 7/22/20 6:16 AM, Stephen Rothwell wrote: >> Hi all, >> >> Changes since 20200721: >> > > on i386: > when CONFIG_SYSCTL is not set/enabled: > > ERROR: modpost: "sysctl_vals" [drivers/net/vrf.ko] undefined! > > thanks for the report; I'll send a patch when I get a few minutes.
Re: linux-next: Tree for Jul 22 (sound/soc/tegra/snd-soc-tegra210-dmic)
On 7/22/20 6:16 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20200721: > on i386: ERROR: modpost: "__udivdi3" [sound/soc/tegra/snd-soc-tegra210-dmic.ko] undefined! ERROR: modpost: "__divdi3" [sound/soc/tegra/snd-soc-tegra210-dmic.ko] undefined! -- ~Randy Reported-by: Randy Dunlap
Re: linux-next: Tree for Jul 22 (drivers/net/vrf)
On 7/22/20 6:16 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20200721: > on i386: when CONFIG_SYSCTL is not set/enabled: ERROR: modpost: "sysctl_vals" [drivers/net/vrf.ko] undefined! -- ~Randy Reported-by: Randy Dunlap
linux-next: Tree for Jul 22
Hi all, Changes since 20200721: My fixes tree contains: dbf24e30ce2e ("device_cgroup: Fix RCU list debugging warning") The xtensa tree gained a conflict against the csky tree. The pci tree gained a build failure so I used the version from next-20200721. The bpf-next tree gained conflicts against the net tree. The input tree gained a conflict against Linus' tree. The security tree still had its build failure for which I applied a patch. The devicetree tree gained a conflict against the drm tree. The tip tree still had one build failure for which I reverted a commit. The scsi-mkp tree still had its build failure so I marked a CONFIG option as broken. The pidfd tree gained a conflict against the sh tree. The akpm-current tree lost its build failure. Non-merge commits (relative to Linus' tree): 9310 10041 files changed, 499369 insertions(+), 191569 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 325 trees (counting Linus' and 83 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 (4fa640dc5230 Merge tag 'vfio-v5.8-rc7' of git://github.com/awilliam/linux-vfio into master) Merging fixes/master (dbf24e30ce2e device_cgroup: Fix RCU list debugging warning) Merging kbuild-current/fixes (20b1be595282 kbuild: fix single target builds for external modules) Merging arc-current/for-curr (11ba468877bb Linux 5.8-rc5) Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late()) Merging arm-soc-fixes/arm/fixes (2648298a06ba Merge tag 'socfpga_fixes_for_v5.8_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) Merging arm64-fixes/for-next/fixes (f32ed8eb0e3f drivers/perf: Prevent forced unbinding of PMU drivers) Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-length array with flexible-array member) Merging powerpc-fixes/fixes (f0479c4bcbd9 selftests/powerpc: Use proper error code to check fault address) Merging s390-fixes/fixes (3d3af181d370 s390/cpum_cf,perf: change DFLT_CCERROR counter name) Merging sparc/master (37719576046b arch/sparc: Replace HTTP links with HTTPS ones) Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) Merging net/master (3506b2f42dff net: dsa: microchip: call phy_remove_link_mode during probe) Merging bpf/master (5b801dfb7feb bpf: Fix NULL pointer dereference in __btf_resolve_helper_id()) Merging ipsec/master (0a266f8954e2 Merge remote-tracking branch 'origin/testing') Merging netfilter/master (1e9451cbda45 netfilter: nf_tables: fix nat hook table deletion) Merging ipvs/master (eadede5f9362 Merge branch 'hns3-fixes') Merging wireless-drivers/master (1cfd3426ef98 ath10k: Fix NULL pointer dereference in AHB device probe) Merging mac80211/master (8ff41cc21714 net: qrtr: Fix an out of bounds read qrtr_endpoint_post()) Merging rdma-fixes/for-rc (a862192e9227 RDMA/mlx5: Prevent prefetch from racing with implicit destruction) Merging sound-current/for-linus (568e4e82128a ALSA: hda/realtek: Fixed ALC298 sound bug by adding quirk for Samsung Notebook Pen S) Merging sound-asoc-fixes/for-linus (70a5e6938d0b Merge remote-tracking branch
linux-next: Tree for Jul 22
Hi all, Changes since 20190719: The net tree gained a conflict against Linus' tree. The extcon tree lost its build failure. Non-merge commits (relative to Linus' tree): 732 582 files changed, 19319 insertions(+), 13284 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 299 trees (counting Linus' and 72 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 (5f9e832c1370 Linus 5.3-rc1) Merging fixes/master (c309b6f24222 Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging kbuild-current/fixes (f1a3b43cc1f5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging arc-current/for-curr (24a20b0a443f ARC: [plat-hsdk]: Enable AXI DW DMAC in defconfig) Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) Merging arm-soc-fixes/arm/fixes (0ecfebd2b524 Linux 5.2) Merging arm64-fixes/for-next/fixes (aa69fb62bea1 arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly) Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) Merging powerpc-fixes/fixes (03800e0526ee powerpc: fix off by one in max_zone_pfn initialization for ZONE_DMA) Merging s390-fixes/fixes (9a159190414d s390/unwind: avoid int overflow in outside_of_stack) Merging sparc/master (192f0f8e9db7 Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (107e47cc80ec vrf: make sure skb->data contains ip header to make routing) CONFLICT (content): Merge conflict in include/Kbuild Merging bpf/master (1d4126c4e119 libbpf: sanitize VAR to conservative 1-byte INT) Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev) Merging netfilter/master (15a78ba1844a netfilter: ebtables: fix a memory leak bug in compat) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (41a531ffa4c5 rt2x00usb: fix rx queue hang) Merging mac80211/master (d2b3fe42bc62 mac80211: don't warn about CW params when not using them) Merging rdma-fixes/for-rc (4b972a01a7da Linux 5.2-rc6) Merging sound-current/for-linus (0e279dcea0ec ALSA: pcm: Fix refcount_inc() on zero usage) Merging sound-asoc-fixes/for-linus (496017510d4a Merge branch 'asoc-5.2' into asoc-linus) Merging regmap-fixes/for-linus (ea09b3e21f18 Merge branch 'regmap-5.2' into regmap-linus) Merging regulator-fixes/for-linus (9b955dd030c3 Merge branch 'regulator-5.2' into regulator-linus) Merging spi-fixes/for-linus (5b84322c08aa Merge branch 'spi-5.2' into spi-linus) Merging pci-current/for-linus (6dbbd053e6ae PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present) Merging driver-core.current/driver-core-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging tty.current/tty-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging usb.current/usb-linus (9637d517347e Merge tag 'for-linus-20190715' of git://git.kernel.dk/linux-block) Merging usb-gadget-fixes/fixes (42de8afc40c9 usb: dwc2: Use generic PHY width in params setup) Merging
Re: linux-next: Tree for Jul 22
On Fri, Jul 22, 2016 at 3:28 PM, Paul Gortmakerwrote: [...] > > For x86-64 allmod, I am seeing this issue for the 1st time today > in my local builds, even though it doesn't appear in sfr's builds: > > FATAL: drivers/input/evbug: sizeof(struct input_device_id)=312 is not > a modulo of the size of section > __mod_input___device_table=384. > Fix definition of struct input_device_id in mod_devicetable.h > make[2]: *** [__modpost] Error 1 > make[1]: *** [modules] Error 2 > make: *** [sub-make] Error 2 > > paul@builder:~/git/linux-head$ git describe > next-20160722 > > Nothing has touched drivers/input/evbug.c for years... Circling back to look at this more, it seems to be a result of the makefiles not clobbering something properly when using the same build directory from yesterday's next build today. Once I executed a "make clean" I could not reproduce it. P. --
Re: linux-next: Tree for Jul 22
On Fri, Jul 22, 2016 at 3:28 PM, Paul Gortmaker wrote: [...] > > For x86-64 allmod, I am seeing this issue for the 1st time today > in my local builds, even though it doesn't appear in sfr's builds: > > FATAL: drivers/input/evbug: sizeof(struct input_device_id)=312 is not > a modulo of the size of section > __mod_input___device_table=384. > Fix definition of struct input_device_id in mod_devicetable.h > make[2]: *** [__modpost] Error 1 > make[1]: *** [modules] Error 2 > make: *** [sub-make] Error 2 > > paul@builder:~/git/linux-head$ git describe > next-20160722 > > Nothing has touched drivers/input/evbug.c for years... Circling back to look at this more, it seems to be a result of the makefiles not clobbering something properly when using the same build directory from yesterday's next build today. Once I executed a "make clean" I could not reproduce it. P. --
Re: linux-next: Tree for Jul 22
On Fri, Jul 22, 2016 at 3:10 AM, Stephen Rothwellwrote: > Hi all, > > Changes since 20160721: > > The powerpc tree gained a build failure for which I applied a fix patch. There still are new failures in corenet32/64 and mpc85xx; looks like: arch/powerpc/sysdev/fsl_rio.c:702:11: error: 'struct rio_mport' has no member named 'phy_type' arch/powerpc/sysdev/fsl_rio.c:702:25: error: 'RIO_PHY_SERIAL' undeclared (first use in this function) make[2]: *** [arch/powerpc/sysdev/fsl_rio.o] Error 1 http://kisskb.ellerman.id.au/kisskb/buildresult/12750610/ > > The fuse tree gained a build failure due to an interaction with the > btrfs-kdave tree, so I applied a merge fix patch. > > The pm tree gained a build failure, so I used the version from > next-20160721. > > The nvdimm tree lost its build failure but gained another due to an > interaction with the device-mapper tree. I applied a merge fix patch. > > Non-merge commits (relative to Linus' tree): 10807 > 9936 files changed, 548899 insertions(+), 195049 deletions(-) The crypto issue I mentioned yesterday seems to be gone. The allmod xfs issue for mips/sparc remains. For x86-64 allmod, I am seeing this issue for the 1st time today in my local builds, even though it doesn't appear in sfr's builds: FATAL: drivers/input/evbug: sizeof(struct input_device_id)=312 is not a modulo of the size of section __mod_input___device_table=384. Fix definition of struct input_device_id in mod_devicetable.h make[2]: *** [__modpost] Error 1 make[1]: *** [modules] Error 2 make: *** [sub-make] Error 2 paul@builder:~/git/linux-head$ git describe next-20160722 Nothing has touched drivers/input/evbug.c for years... Paul. -- > > > > 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 239 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 >
Re: linux-next: Tree for Jul 22
On Fri, Jul 22, 2016 at 3:10 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20160721: > > The powerpc tree gained a build failure for which I applied a fix patch. There still are new failures in corenet32/64 and mpc85xx; looks like: arch/powerpc/sysdev/fsl_rio.c:702:11: error: 'struct rio_mport' has no member named 'phy_type' arch/powerpc/sysdev/fsl_rio.c:702:25: error: 'RIO_PHY_SERIAL' undeclared (first use in this function) make[2]: *** [arch/powerpc/sysdev/fsl_rio.o] Error 1 http://kisskb.ellerman.id.au/kisskb/buildresult/12750610/ > > The fuse tree gained a build failure due to an interaction with the > btrfs-kdave tree, so I applied a merge fix patch. > > The pm tree gained a build failure, so I used the version from > next-20160721. > > The nvdimm tree lost its build failure but gained another due to an > interaction with the device-mapper tree. I applied a merge fix patch. > > Non-merge commits (relative to Linus' tree): 10807 > 9936 files changed, 548899 insertions(+), 195049 deletions(-) The crypto issue I mentioned yesterday seems to be gone. The allmod xfs issue for mips/sparc remains. For x86-64 allmod, I am seeing this issue for the 1st time today in my local builds, even though it doesn't appear in sfr's builds: FATAL: drivers/input/evbug: sizeof(struct input_device_id)=312 is not a modulo of the size of section __mod_input___device_table=384. Fix definition of struct input_device_id in mod_devicetable.h make[2]: *** [__modpost] Error 1 make[1]: *** [modules] Error 2 make: *** [sub-make] Error 2 paul@builder:~/git/linux-head$ git describe next-20160722 Nothing has touched drivers/input/evbug.c for years... Paul. -- > > > > 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 239 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 >
linux-next: Tree for Jul 22
Hi all, Changes since 20160721: The powerpc tree gained a build failure for which I applied a fix patch. The fuse tree gained a build failure due to an interaction with the btrfs-kdave tree, so I applied a merge fix patch. The pm tree gained a build failure, so I used the version from next-20160721. The nvdimm tree lost its build failure but gained another due to an interaction with the device-mapper tree. I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 10807 9936 files changed, 548899 insertions(+), 195049 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 239 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 (47ef4ad2684d Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd) Merging fixes/master (5edb56491d48 Linux 4.7-rc3) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (882b0f2fba83 net/mlx5e: Fix del vxlan port command buffer memset) Merging ipsec/master (1ba5bf993c6a xfrm: fix crash in XFRM_MSG_GETSA netlink handler) Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup) Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation) Merging sound-current/for-linus (76df52969711 ALSA: usb-audio: Fix quirks code is not called) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (92d21ac74a9e Linux 4.7-rc7) Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6) Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6) Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4) Merging input-current/for-linus (e9003c9cfaa1 Input: tsc200x - report proper input_dev name) Merging crypto-current/master (81dc0365cfa7 crypto: qat - make qat_asym_algs.o depend on asn1 headers) Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read) Merging kselftest-fixes/fixes (f80eb4289491
linux-next: Tree for Jul 22
Hi all, Changes since 20160721: The powerpc tree gained a build failure for which I applied a fix patch. The fuse tree gained a build failure due to an interaction with the btrfs-kdave tree, so I applied a merge fix patch. The pm tree gained a build failure, so I used the version from next-20160721. The nvdimm tree lost its build failure but gained another due to an interaction with the device-mapper tree. I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 10807 9936 files changed, 548899 insertions(+), 195049 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 239 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 (47ef4ad2684d Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd) Merging fixes/master (5edb56491d48 Linux 4.7-rc3) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (882b0f2fba83 net/mlx5e: Fix del vxlan port command buffer memset) Merging ipsec/master (1ba5bf993c6a xfrm: fix crash in XFRM_MSG_GETSA netlink handler) Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup) Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation) Merging sound-current/for-linus (76df52969711 ALSA: usb-audio: Fix quirks code is not called) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (92d21ac74a9e Linux 4.7-rc7) Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6) Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6) Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4) Merging input-current/for-linus (e9003c9cfaa1 Input: tsc200x - report proper input_dev name) Merging crypto-current/master (81dc0365cfa7 crypto: qat - make qat_asym_algs.o depend on asn1 headers) Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read) Merging kselftest-fixes/fixes (f80eb4289491
linux-next: Tree for Jul 22
Hi all, Changes since 20150721: The nfsd tree lost its build failure. The wireless-drivers-next tree gained a build failure so I used the version from next-20150721. The kvms390 tree gained a conflict against the s390 tree. The gpio tree lost its build failure. Non-merge commits (relative to Linus' tree): 3281 3191 files changed, 144170 insertions(+), 54351 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, a multi_v7_defconfig for arm and a native build of tools/perf. 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 224 trees (counting Linus' and 33 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 (9d634c410b07 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (0871b7248113 ARM: fix __virt_to_idmap build error on !MMU) Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) 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-fixes/fixes (bc0195aad0da Linux 4.2-rc2) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging powerpc-merge-benh/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) Merging net/master (1e353cddcf81 drivers: net: cpsw: remove tx event processing in rx napi poll) Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) Merging sound-current/for-linus (6c3d91193d82 ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda) Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) Merging wireless-drivers/master (df2cd4586f17 Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (52721d9d3334 Linux 4.2-rc3) Merging tty.current/tty-linus (52721d9d3334 Linux 4.2-rc3) Merging usb.current/usb-linus (52721d9d3334 Linux 4.2-rc3) Merging usb-gadget-fixes/fixes (b2e2c94b878b usb: gadget: f_midi: fix error recovery path) Merging usb-serial-fixes/usb-linus (09290f419223 USB: pl2303: fix baud-rate divisor calculations) Merging staging.current/staging-linus (52721d9d3334 Linux 4.2-rc3) Merging char-misc.current/char-misc-linus (52721d9d3334 Linux 4.2-rc3) Merging input-current/for-linus (d98399e688f8 Input: elantech - force resolution of 31 u/mm) Merging crypto-current/master (030f4e968741 crypto: nx - Fix reentrancy bugs) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (758556bdc1c8 module: Fix load_module() error path) Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) Merging
linux-next: Tree for Jul 22
Hi all, Changes since 20150721: The nfsd tree lost its build failure. The wireless-drivers-next tree gained a build failure so I used the version from next-20150721. The kvms390 tree gained a conflict against the s390 tree. The gpio tree lost its build failure. Non-merge commits (relative to Linus' tree): 3281 3191 files changed, 144170 insertions(+), 54351 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, a multi_v7_defconfig for arm and a native build of tools/perf. 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 224 trees (counting Linus' and 33 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 (9d634c410b07 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (0871b7248113 ARM: fix __virt_to_idmap build error on !MMU) Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) 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-fixes/fixes (bc0195aad0da Linux 4.2-rc2) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging powerpc-merge-benh/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) Merging net/master (1e353cddcf81 drivers: net: cpsw: remove tx event processing in rx napi poll) Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) Merging sound-current/for-linus (6c3d91193d82 ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda) Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) Merging wireless-drivers/master (df2cd4586f17 Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (52721d9d3334 Linux 4.2-rc3) Merging tty.current/tty-linus (52721d9d3334 Linux 4.2-rc3) Merging usb.current/usb-linus (52721d9d3334 Linux 4.2-rc3) Merging usb-gadget-fixes/fixes (b2e2c94b878b usb: gadget: f_midi: fix error recovery path) Merging usb-serial-fixes/usb-linus (09290f419223 USB: pl2303: fix baud-rate divisor calculations) Merging staging.current/staging-linus (52721d9d3334 Linux 4.2-rc3) Merging char-misc.current/char-misc-linus (52721d9d3334 Linux 4.2-rc3) Merging input-current/for-linus (d98399e688f8 Input: elantech - force resolution of 31 u/mm) Merging crypto-current/master (030f4e968741 crypto: nx - Fix reentrancy bugs) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (758556bdc1c8 module: Fix load_module() error path) Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) Merging
linux-next: Tree for Jul 22
Hi all, Changes since 20130719: The sound-asoc tree lost its build failure. 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 230 trees (counting Linus' and 33 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 (3b2f64d Linux 3.11-rc2) Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n) Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) Merging arc-current/for-curr (ad81f05 Linux 3.11-rc1) Merging arm-current/fixes (433d209 ARM: fix warnings caused by removal of __CPUINIT section) Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1) Merging metag-fixes/fixes (d903bca metag: checksum.h: fix carry in csum_tcpudp_nofold) Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE) Merging sparc/master (6d128e1 Revert "Makefile: Fix install error with make -j option") Merging net/master (f5f7ab6 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless) Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) Merging sound-current/for-linus (be2f93a ALSA: usb-audio: 6fire: return correct XRUN indication) Merging pci-current/for-linus (ad81f05 Linux 3.11-rc1) Merging wireless/master (64b6f46 ath9k_hw: Fix multicast search for AR9002 family) Merging driver-core.current/driver-core-linus (08801f9 driver-core: fix new kernel-doc warning in base/platform.c) Merging tty.current/tty-linus (ad81f05 Linux 3.11-rc1) Merging usb.current/usb-linus (e583d9d USB: global suspend and remote wakeup don't mix) Merging staging.current/staging-linus (3b2f64d Linux 3.11-rc2) Merging char-misc.current/char-misc-linus (ed4bb97 Tools: hv: KVP: Fix a bug in IPV6 subnet enumeration) Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus) Merging md-current/for-linus (ff9db74 md/raid1: fix bio handling problems in process_checks()) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (9c23b7d crypto: caam - Fixed the memory out of bound overwrite issue) 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 irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs) Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line) Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) Merging gpio-current/gpio/merge (397eada gpio/omap: don't use linear domain mapping for OMAP1) Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) Merging vfio-fixes/for-linus (7d13205 Linux 3.10-rc6) Merging drm-intel-fixes/drm-intel-fixes (181d1b9 drm/i915: fix up gt init sequence fallout) Merging asm-generic/master (fb9de7e xtensa: Use generic
linux-next: Tree for Jul 22
Hi all, Changes since 20130719: The sound-asoc tree lost its build failure. 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 230 trees (counting Linus' and 33 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 (3b2f64d Linux 3.11-rc2) Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n) Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) Merging arc-current/for-curr (ad81f05 Linux 3.11-rc1) Merging arm-current/fixes (433d209 ARM: fix warnings caused by removal of __CPUINIT section) Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1) Merging metag-fixes/fixes (d903bca metag: checksum.h: fix carry in csum_tcpudp_nofold) Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE) Merging sparc/master (6d128e1 Revert Makefile: Fix install error with make -j option) Merging net/master (f5f7ab6 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless) Merging ipsec/master (01cb71d net_sched: restore overhead xxx handling) Merging sound-current/for-linus (be2f93a ALSA: usb-audio: 6fire: return correct XRUN indication) Merging pci-current/for-linus (ad81f05 Linux 3.11-rc1) Merging wireless/master (64b6f46 ath9k_hw: Fix multicast search for AR9002 family) Merging driver-core.current/driver-core-linus (08801f9 driver-core: fix new kernel-doc warning in base/platform.c) Merging tty.current/tty-linus (ad81f05 Linux 3.11-rc1) Merging usb.current/usb-linus (e583d9d USB: global suspend and remote wakeup don't mix) Merging staging.current/staging-linus (3b2f64d Linux 3.11-rc2) Merging char-misc.current/char-misc-linus (ed4bb97 Tools: hv: KVP: Fix a bug in IPV6 subnet enumeration) Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus) Merging md-current/for-linus (ff9db74 md/raid1: fix bio handling problems in process_checks()) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (9c23b7d crypto: caam - Fixed the memory out of bound overwrite issue) 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 irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs) Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line) Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) Merging gpio-current/gpio/merge (397eada gpio/omap: don't use linear domain mapping for OMAP1) Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) Merging vfio-fixes/for-linus (7d13205 Linux 3.10-rc6) Merging drm-intel-fixes/drm-intel-fixes (181d1b9 drm/i915: fix up gt init sequence fallout) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for