LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: Tree for Feb 24
@ 2008-02-25  6:31 Stephen Rothwell
  2008-02-25 10:12 ` Frank Seidel
  0 siblings, 1 reply; 30+ messages in thread
From: Stephen Rothwell @ 2008-02-25  6:31 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 704 bytes --]

Hi all,

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.

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
allmodconfig for both powerpc and x86_64.

There were only two minor merge problems.

We are up to 33 trees, more are welcome (even if they are currently
empty).

Status of my local build tests is at
http://kisskb.ellerman.id.au/kisskb/branch/9/.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-25  6:31 linux-next: Tree for Feb 24 Stephen Rothwell
@ 2008-02-25 10:12 ` Frank Seidel
  2008-02-25 11:11   ` Stephen Rothwell
  0 siblings, 1 reply; 30+ messages in thread
From: Frank Seidel @ 2008-02-25 10:12 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML

Hi,

Stephen Rothwell wrote:
> I have created today's linux-next tree at

i bet your $SUBJECT was meant for the Tree for Feb 25, wasn't it? 
;-)

Thanks,
Frank

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-25 10:12 ` Frank Seidel
@ 2008-02-25 11:11   ` Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2008-02-25 11:11 UTC (permalink / raw)
  To: Frank Seidel; +Cc: linux-next, LKML

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

Hi Frank,

On Mon, 25 Feb 2008 11:12:45 +0100 Frank Seidel <fseidel@suse.de> wrote:
>
> Stephen Rothwell wrote:
> > I have created today's linux-next tree at
> 
> i bet your $SUBJECT was meant for the Tree for Feb 25, wasn't it? 
> ;-)

Damn!  I remembered to reread to body of the mail and forgot to check the
subject - one more for the TODO list :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2022-02-25  2:16 broonie
  0 siblings, 0 replies; 30+ messages in thread
From: broonie @ 2022-02-25  2:16 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

Hi all,

Changes since 20220223:

The btrfs tree gained several conflicts with the btrfs-fixes tree.

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

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

The drm tree gained a conflict with the drm-intel-gt tree.

The akpm tree was updated and merged, thanks to Andrew for his help with
this.

Non-merge commits (relative to Linus' tree): 7842
 8121 files changed, 894334 insertions(+), 225439 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 defconfig for arm64, 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, arm64 allnoconfig, arm64 allyesconfig and i386,
and arm64 and htmldocs.

Below is a summary of the state of the merge.

I am currently merging 346 trees (counting Linus' and 93 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.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2021-02-24  3:36 Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2021-02-24  3:36 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 37739 bytes --]

Hi all,

Please do not add any changes destined for v5.13 to your linux-next
included branches until after v5.12-rc1 has been released.

Changes since 20210223:

The risc-v tree gained a conflict against Linus' tree.

The amdgpu tree lost its build failure.

The block tree lost its build failure.

Non-merge commits (relative to Linus' tree): 2098
 2240 files changed, 79801 insertions(+), 36902 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 333 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 (5cf0fd591f2e Kbuild: disable TRIM_UNUSED_KSYMS option)
Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2)
Merging kbuild-current/fixes (fe968c41ac4f scripts: set proper OpenSSL include dir also for sign-file)
Merging arc-current/for-curr (7c53f6b671f4 Linux 5.11-rc3)
Merging arm-current/fixes (4d62e81b60d4 ARM: kexec: fix oops after TLB are invalidated)
Merging arm64-fixes/for-next/fixes (2e8acca1911b arm64/mm: Fixed some coding style issues)
Merging arm-soc-fixes/arm/fixes (090e502e4e63 Merge tag 'socfpga_dts_fix_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes)
Merging drivers-memory-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging m68k-current/for-linus (c396dd2ec5bb macintosh/adb-iop: Use big-endian autopoll mask)
Merging powerpc-fixes/fixes (f40ddce88593 Linux 5.11)
Merging s390-fixes/fixes (92bf22614b21 Linux 5.11-rc7)
Merging sparc/master (356184fb6d67 sparc: make xchg() into a statement expression)
CONFLICT (content): Merge conflict in arch/sparc/Kconfig
Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files)
Merging net/master (2c8396de7225 Merge branch 'r8152-minor-adjustments')
Merging bpf/master (53f523f3052a bpf: Clear percpu pointers in bpf_prog_clone_free())
Merging ipsec/master (8fc0e3b6a866 xfrm: interface: fix ipv4 pmtu check to honor ip header df)
Merging netfilter/master (3af409ca278d net: enetc: fix destroyed phylink dereference during unbind)
Merging ipvs/master (44a674d6f798 Merge tag 'mlx5-fixes-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
Merging wireless-drivers/master (4538c5ed0f7e iwlwifi: avoid crash on unsupported debug collection)
Merging mac80211/master (3af409ca278d net: enetc: fix destroyed phylink dereference during unbind)
Merging rdma-fixes/for-rc (1048ba83fb1c Linux 5.11-rc6)
Merging sound-current/for-linus (c4294d7f057d ALSA: hda: intel-dsp-config: add Alder Lake support)
Merging sound-asoc-fixes/for-linus (098474f3cf61 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus)
Merging regmap-fixes/for-linus (19c329f68089 Linux 5.11-rc4)
Merging regulator-fixes/for-linus (e124039e9567 Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus)
Merging spi-fixes/for-linus (ecce3daec27a Merge remote-tracking branch 'spi/for-5.12' into spi-linus)
Merging pci-current/for-linus (7e69d07d7c3c Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume")
Merging driver-core.current/driver-core-linus (6ee1d745b7c9 Linux 5.11-rc5)
Merging tty.current/tty-linus (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging usb.current/usb-linus (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup)
Merging usb-serial-fixes/usb-linus (92bf22614b21 Linux 5.11-rc7)
Merging usb-chipidea-fixes/for-usb-fixes (491b1bea0004 MAINTAINERS: update Peter Chen's email address)
Merging phy/fixes (9a8b9434c60f phy: mediatek: Add missing MODULE_DEVICE_TABLE())
Merging staging.current/staging-linus (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging char-misc.current/char-misc-linus (6ee1d745b7c9 Linux 5.11-rc5)
Merging soundwire-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging thunderbolt-fixes/fixes (f40ddce88593 Linux 5.11)
Merging input-current/for-linus (1bff77f41a80 Input: st1232 - fix NORMAL vs. IDLE state handling)
Merging crypto-current/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API)
Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
Merging vfio-fixes/for-linus (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV)
Merging kselftest-fixes/fixes (7a6eb7c34a78 selftests: Skip BPF seftests by default)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging dmaengine-fixes/fixes (b6c14d7a8380 dmaengine dw: Revert "dmaengine: dw: Enable runtime PM")
Merging backlight-fixes/for-backlight-fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging mtd-fixes/mtd/fixes (b135b3358d73 mtd: rawnand: omap: Use BCH private fields in the specific OOB layout)
Merging mfd-fixes/for-mfd-fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging v4l-dvb-fixes/fixes (ef357e02b6c4 media: rockchip: rkisp1: extend uapi array sizes)
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (7b490a8ab0f2 MIPS: OCTEON: fix unreachable code in octeon_irq_init_ciu)
Merging at91-fixes/at91-fixes (16457a528e63 ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet)
Merging omap-fixes/fixes (9bbce32a20d6 ARM: dts: am33xx: add aliases for mmc interfaces)
Merging kvm-fixes/master (031b91a5fe6f KVM: x86: Set so called 'reserved CR3 bits in LM mask' at vCPU reset)
Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390)
Merging hwmon-fixes/hwmon (4008bc7d3953 hwmon: (dell-smm) Add XPS 15 L502X to fan control blacklist)
Merging nvdimm-fixes/libnvdimm-fixes (7018c897c2f2 libnvdimm/dimm: Avoid race between probe and available_slots_show())
Merging btrfs-fixes/next-fixes (08b609a13e80 Merge branch 'misc-5.12' into next-fixes)
Merging vfs-fixes/fixes (d36a1dd9f77a dump_common_audit_data(): fix racy accesses to ->d_name)
Merging dma-mapping-fixes/for-linus (d17405d52bac dma-mapping: benchmark: fix kernel crash when dma_map_single fails)
Merging i3c-fixes/i3c/fixes (291b5c9870fc i3c/master/mipi-i3c-hci: Fix position of __maybe_unused in i3c_hci_of_match)
Merging drivers-x86-fixes/fixes (215164bfb714 platform/x86: dell-wmi-sysman: fix a NULL pointer dereference)
Merging samsung-krzk-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging pinctrl-samsung-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging devicetree-fixes/dt/linus (32ada6b0980d dt-bindings: Cleanup standard unit properties)
Merging scsi-fixes/fixes (f852c596f2ee scsi: scsi_debug: Fix a memory leak)
Merging drm-fixes/drm-fixes (f40ddce88593 Linux 5.11)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (f40ddce88593 Linux 5.11)
Merging mmc-fixes/fixes (d7fb9c242095 mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb)
Merging rtc-fixes/rtc-fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging gnss-fixes/gnss-linus (7c53f6b671f4 Linux 5.11-rc3)
Merging hyperv-fixes/hyperv-fixes (fff7b5e6ee63 x86/hyperv: Initialize clockevents after LAPIC is initialized)
Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu))
Merging risc-v-fixes/fixes (3da3cc1b5f47 Revert "dts: phy: add GPIO number and active state used for phy reset")
Merging pidfd-fixes/fixes (a409ed156a90 Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio)
Merging fpga-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging spdx/spdx-linus (6ee1d745b7c9 Linux 5.11-rc5)
Merging gpio-brgl-fixes/gpio/for-current (f40ddce88593 Linux 5.11)
Merging gpio-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging pinctrl-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1)
Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (2b8fdbbf1c61 kunit: tool: move kunitconfig parsing into __init__, make it optional)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid())
Merging cel-fixes/for-rc (1165069361b2 fs: nfsd: fix kconfig dependency warning for NFSD_V4)
Merging drm-misc-fixes/for-linux-next-fixes (8fd167361316 drm/ttm: Fix a memory leak)
Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang)
Merging kbuild/for-next (3d235355a792 initramfs: Remove redundant dependency of RD_ZSTD on BLK_DEV_INITRD)
CONFLICT (content): Merge conflict in scripts/Makefile.lib
CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/Makefile
Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4)
Merging dma-mapping/for-next (3dc47131f8aa media: uvcvideo: Use dma_alloc_noncontiguos API)
Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' into asm-generic)
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
Merging arm/for-next (1afb7e6348aa Merge branch 'devel-stable' into for-next)
Merging arm64/for-next/core (1ffa9763828c Merge branch 'for-next/vdso' into for-next/core)
Merging arm-perf/for-next/perf (f0c140481d1b perf: Constify static struct attribute_group)
Merging arm-soc/for-next (e6c44b8c57c9 soc: document merges)
Merging actions/for-next (006828d706fd Merge branch 'v5.12/defconfig' into for-next)
Merging amlogic/for-next (9faeb18107d1 Merge branch 'v5.12/soc' into tmp/aml-rebuild)
Merging aspeed/for-next (697dabd5d370 Merge branches 'soc-for-v5.12' and 'dt-for-v5.12' into for-next)
Merging at91/at91-next (9639bdcf8954 Merge branch 'at91-fixes' into at91-next)
Merging drivers-memory/for-next (5c289c7fae29 Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (7535d59c5f11 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next)
Merging mediatek/for-next (e6468af3b590 Merge branch 'v5.11-next/soc' into for-next)
Merging mvebu/for-next (8e03d45cb7de Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (01e73147cbf8 Merge branch 'fixes' into for-next)
Merging qcom/for-next (d79b47c59576 Merge branches 'arm64-defconfig-for-5.12', 'arm64-for-5.12', 'defconfig-for-5.12', 'drivers-for-5.12' and 'dts-for-5.12' into for-next)
Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller)
Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
Merging renesas/next (fc6f32116126 Merge branches 'renesas-arm-dt-for-v5.12' and 'renesas-drivers-for-v5.12' into renesas-next)
Merging reset/reset/next (d17655759b3f reset: Add devm_reset_control_get_optional_exclusive_released())
Merging rockchip/for-next (38051549ac38 Merge branch 'v5.12-clk/next' into for-next)
Merging samsung-krzk/for-next (da2f247fcbf4 Merge branch 'next/soc' into for-next)
Merging scmi/for-linux-next (f40ddce88593 Linux 5.11)
Merging stm32/stm32-next (a9c92a9671d7 ARM: dts: stm32: add #clock-cells property to usbphyc node on stm32mp151)
Merging sunxi/sunxi/for-next (a352e9e72aa3 Merge branch 'sunxi/dt-for-5.12-late' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-r16-parrot.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-a33-olinuxino.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-primo81.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-m9.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-hummingbird.dts
Merging tegra/for-next (b62f4a3fbb22 Merge branch for-5.12/arm64/defconfig into for-next)
Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
Merging ti-k3-new/ti-k3-next (e37eac10bb5d Merge branch 'ti-k3-dts-next' into ti-k3-next)
Merging clk/clk-next (4d5c4ae32945 Merge branches 'clk-socfpga', 'clk-mstar', 'clk-qcom' and 'clk-warnings' into clk-next)
Merging clk-renesas/renesas-clk (24ece96554a9 clk: renesas: cpg-mssr: Fix formatting issues for 'smstpcr_saved's documentation)
Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops)
Merging csky/linux-next (9d986b01feb9 csky: use free_initmem_default() in free_initmem())
Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
Merging m68k/for-next (c396dd2ec5bb macintosh/adb-iop: Use big-endian autopoll mask)
Merging m68knommu/for-next (c1fb1bf64bb6 m68k: let clk_enable() return immediately if clk is NULL)
Merging microblaze/next (48783be427c7 microblaze: Fix built-in DTB alignment to be 8-byte aligned)
Merging mips/mips-next (057a14d610cf arch: mips: update references to current linux-mips list)
Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (8f722f67452f openrisc: Use devicetree to determine present cpus)
Merging parisc-hd/for-next (f40ddce88593 Linux 5.11)
Merging powerpc/next (82d2c16b350f powerpc/perf: Adds support for programming of Thresholding in P10)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A)
Merging risc-v/for-next (d7fbcf40df86 riscv: Improve kasan population by using hugepages when possible)
CONFLICT (content): Merge conflict in drivers/soc/Makefile
CONFLICT (content): Merge conflict in drivers/soc/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/mm/Makefile
Merging s390/for-next (b47f625e102b Merge branch 'features' into for-next)
Merging sh/for-next (b89bc060b53e sh/intc: Restore devm_ioremap() alignment)
Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging uml/linux-next (ddad5187fc2a um: irq.h: include <asm-generic/irq.h>)
Merging xtensa/xtensa-for-next (7b79eba1d0d1 xtensa: fix spelling mistake in Kconfig "wont" -> "won't")
Merging pidfd/for-next (f69e8091c4a2 xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl)
CONFLICT (content): Merge conflict in security/integrity/ima/ima_policy.c
CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c
CONFLICT (content): Merge conflict in security/integrity/ima/ima_api.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c
CONFLICT (content): Merge conflict in fs/overlayfs/inode.c
CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/f2fs/file.c
CONFLICT (content): Merge conflict in fs/f2fs/acl.c
CONFLICT (content): Merge conflict in fs/ecryptfs/inode.c
Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy)
Merging fscache/fscache-next (32685453751f netfs: Hold a ref on a page when PG_private_2 is set)
CONFLICT (content): Merge conflict in lib/iov_iter.c
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
Merging btrfs/for-next (191e697796c2 Merge branch 'for-next-next-v5.11-20210217' into for-next-20210217)
CONFLICT (content): Merge conflict in lib/iov_iter.c
Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the Fb is used)
Merging cifs/for-next (3453f7fa1002 cifs: ignore FL_FLOCK locks in read/write)
Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue)
Merging ecryptfs/next (902af369942f ecryptfs: use DEFINE_MUTEX() for mutex lock)
Merging erofs/dev (ce0631291813 erofs: initialized fields can only be observed after bit is set)
Merging exfat/dev (b12b47249688 Merge tag 'powerpc-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
Merging ext3/for_next (c5b8ccc3da76 Pull udf & isofs UID/GID parsing fixes.)
Merging ext4/dev (0a76945fd1ba ext4: add .kunitconfig fragment to enable ext4-specific tests)
Merging f2fs/dev (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (5d069dbe8aaf fuse: fix bad inode)
Merging jfs/jfs-next (4208c398aae4 fs/jfs: fix potential integer overflow on shift of a int)
Merging nfs/linux-next (92bf22614b21 Linux 5.11-rc7)
Merging nfs-anna/linux-next (7ae017c7322e NFS: Support the '-owrite=' option in /proc/self/mounts and mountinfo)
Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class)
Merging cel/for-next (f1dc78fb9a13 NFSD: Clean up after updating NFSv3 ACL encoders)
Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations)
Merging overlayfs/overlayfs-next (d46b7cd68336 ovl: plumb through flush method)
Merging ubifs/next (42119dbe571e ubifs: Fix error return code in alloc_wbufs())
Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation)
Merging xfs/for-next (1cd738b13ae9 xfs: consider shutdown in bmapbt cursor delete assert)
Merging zonefs/for-next (059c01039c01 zonefs: Fix file size of zones in full condition)
Merging iomap/iomap-for-next (ed1128c2d0c8 xfs: reduce exclusive locking on unaligned dio)
Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h)
Merging file-locks/locks-next (cc4a3f885e8f fcntl: make F_GETOWN(EX) return 0 on dead owner task)
Merging vfs/for-next (934ada4633ef Merge branch 'work.misc' into for-next)
CONFLICT (content): Merge conflict in fs/coredump.c
CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst
Merging printk/for-next (f78dd21aa363 Merge branch 'for-5.12-no_hash_pointers' into for-next)
Merging pci/next (6039bd61b69f Merge branch 'remotes/lorenzo/pci/misc')
Merging pstore/for-next/pstore (9c7d83ae6ba6 pstore: Fix warning in pstore_kill_sb())
Merging hid/for-next (914fe0466c86 Merge branch 'for-5.12/playstation-v2' into for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging i2c/i2c/for-next (35ea257a39ae Merge branch 'i2c/for-5.12' into i2c/for-next)
Merging i3c/i3c/next (5c34b8e7e8bb i3c: master: dw: Drop redundant disec call)
Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
Merging hwmon-staging/hwmon-next (6ab3332cc692 MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE)
Merging jc_docs/docs-next (c418eed8c3b7 docs: ABI: testing: ima_policy: Fixed missing bracket)
Merging v4l-dvb/master (8f202f8e9ff3 media: v4l: async: Fix kerneldoc documentation for async functions)
Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include)
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c
CONFLICT (content): Merge conflict in Documentation/dev-tools/kasan.rst
CONFLICT (content): Merge conflict in Documentation/conf.py
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (4475f0291af9 Merge branch 'acpica-fixes' into linux-next)
CONFLICT (modify/delete): arch/x86/platform/intel-mid/device_libs/platform_bt.c deleted in pm/linux-next and modified in HEAD. Version HEAD of arch/x86/platform/intel-mid/device_libs/platform_bt.c left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f arch/x86/platform/intel-mid/device_libs/platform_bt.c
Merging cpufreq-arm/cpufreq/arm/linux-next (67fc209b527d cpufreq: qcom-hw: drop devm_xxx() calls from init/exit hooks)
Merging cpupower/cpupower (3a3ecfdb605c cpupower: Add cpuid cap flag for MSR_AMD_HWCR support)
Merging devfreq/devfreq-next (fc1745c0e40c PM / devfreq: rk3399_dmc: Remove unneeded semicolon)
Merging opp/opp/linux-next (de04241ab87a opp: Don't skip freq update for different frequency)
Merging thermal/thermal/linux-next (a51afb13311c thermal: cpufreq_cooling: freq_qos_update_request() returns < 0 on error)
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
Merging dlm/next (4f19d071f9be fs: dlm: check on existing node address)
Merging swiotlb/linux-next (47cfc5be1934 swiotlb: Validate bounce size in the sync/unmap path)
Merging rdma/for-next (7289e26f395b Merge tag 'v5.11' into rdma.git for-next)
Merging net-next/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging bpf-next/for-next (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging ipsec-next/master (d310ec03a34e Merge tag 'perf-core-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging mlx5-next/mlx5-next (432119de33d9 net/mlx5: Add cyc2time HW translation mode support)
Merging netfilter-next/master (38b5133ad607 octeontx2-pf: Fix otx2_get_fecparam())
Merging ipvs-next/master (a61e4b60761f Merge branch 'net-dsa-hellcreek-add-taprio-offloading')
Merging wireless-drivers-next/master (773dc50d7169 Merge branch 'Xilinx-axienet-updates')
Merging bluetooth/master (55c0bd77479b Bluetooth: hci_qca: Fixed issue during suspend)
Merging mac80211-next/master (38b5133ad607 octeontx2-pf: Fix otx2_get_fecparam())
Merging gfs2/for-next (17d776840885 gfs2: Don't get stuck with I/O plugged in gfs2_ail1_flush)
Merging mtd/mtd/next (6e9dff6fe3fb dt-bindings: mtd: add binding for BCM4908 partitions)
Merging nand/nand/next (073abfa7ea9a mtd: rawnand: intel: Fix an error handling path in 'ebu_dma_start()')
Merging spi-nor/spi-nor/next (75386810d3a6 mtd: spi-nor: sst: Add support for Global Unlock on sst26vf)
Merging crypto/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API)
Merging drm/drm-next (f730f39eb981 Merge tag 'drm-intel-next-fixes-2021-02-18' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
Merging drm-misc/for-linux-next (bfa5782b9caa fbdev: atyfb: add stubs for aty_{ld,st}_lcd())
Merging amdgpu/drm-next (eb3703ae5632 drm/amdgpu: always reset the asic in suspend)
Merging drm-intel/for-linux-next (ed428ffc2852 drm/i915: Nuke INTEL_OUTPUT_FORMAT_INVALID)
Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails)
Merging drm-msm/msm-next (8490f02a3ca4 drm/msm: a6xx: Make sure the SQE microcode is safe)
Merging imx-drm/imx-drm/next (82581fcf070b drm/modes: add non-OF stub for of_get_drm_display_mode)
Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check before some freeing functions is not needed)
Merging regmap/for-next (aa3233086b48 Merge remote-tracking branch 'regmap/for-5.12' into regmap-next)
Merging sound/for-next (c4294d7f057d ALSA: hda: intel-dsp-config: add Alder Lake support)
Merging sound-asoc/for-next (098474f3cf61 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus)
Merging modules/modules-next (1e80d9cb579e module: potential uninitialized return in module_kallsyms_on_each_symbol())
Merging input/next (4c47097f8514 Input: aiptek - convert sysfs sprintf/snprintf family to sysfs_emit)
Merging block/for-next (bc7f5c0e4c95 Merge branch 'block-5.12' into for-next)
Merging device-mapper/for-next (a666e5c05e7c dm: fix deadlock when swapping to encrypted device)
Merging pcmcia/pcmcia-next (4ce6b242b78d pcmcia: Switch to using the new API kobj_to_dev())
Merging mmc/next (a56f44138a2c mmc: sdhci-esdhc-imx: fix kernel panic when remove module)
Merging mfd/for-mfd-next (26783d74cc6a mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq())
Merging backlight/for-backlight-next (0b5e0f45af40 backlight/video: Use Platform getter/setter functions)
Merging battery/for-next (a72acc56f3e9 power-supply: use kobj_to_dev())
Merging regulator/for-next (e124039e9567 Merge remote-tracking branch 'regulator/for-5.12' into regulator-linus)
Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing)
Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check)
Merging integrity/next-integrity (f6692213b504 integrity: Make function integrity_add_key() static)
Merging keys/keys-next (5bcd72358a7d Merge branch 'keys-cve-2020-26541' into keys-next)
Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot)
Merging selinux/next (365982aba1f2 fs: anon_inodes: rephrase to appropriate kernel-doc)
Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions)
Merging tomoyo/master (31caf8b2a847 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging tpmdd/next (8c657a0590de KEYS: trusted: Reserve TPM for seal and unseal operations)
Merging watchdog/master (a4f3407c4160 watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ)
Merging iommu/next (45e606f27269 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging audit/next (127c8c5f0589 audit: Make audit_filter_syscall() return void)
Merging devicetree/for-next (cb8be8b4b27f driver core: platform: Drop of_device_node_put() wrapper)
Merging mailbox/mailbox-for-next (d1e6bc0ca01c mailbox: tegra-hsp: Set lockdep class dynamically)
Merging spi/for-next (ecce3daec27a Merge remote-tracking branch 'spi/for-5.12' into spi-linus)
Merging tip/auto-latest (2126d722fe93 Merge branch 'sched/smp')
Merging clockevents/timers/drivers/next (e85c1d21b16b clocksource/drivers/timer-microchip-pit64b: Add clocksource suspend/resume)
Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next)
Merging irqchip/irq/irqchip-next (c83fd57be3fe irqdomain: Remove debugfs_file from struct irq_domain)
Merging ftrace/for-next (e23db805da2d tracing/tools: Add the latency-collector to tools directory)
Merging rcu/rcu/next (c8c430f4a2fb Merge branch 'nolibc.2021.01.21a' into HEAD)
Merging kvm/next (8c6e67bec319 Merge tag 'kvmarm-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvm-arm/next (c93199e93e12 Merge branch 'kvm-arm64/pmu-debug-fixes-5.11' into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests)
Merging kvms390/next (50a05be484cb KVM: s390: track synchronous pfault events in kvm_stat)
Merging xen-tip/linux-next (53f131c284e8 xen-front-pgdir-shbuf: don't record wrong grant handle upon error)
Merging percpu/for-next (df1c002198a8 Merge branch 'for-5.12' into for-next)
Merging workqueues/for-next (e9ad2eb3d9ae workqueue: Use %s instead of function name)
Merging drivers-x86/for-next (a7d53dbbc70a platform/x86: intel_scu_ipc: Increase virtual timeout from 3 to 5 seconds)
Merging chrome-platform/for-next (b996c10e0f5b Merge tag 'tag-chrome-platform-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux)
Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init)
Merging leds/for-next (7ab39384da0b leds: lp50xx: Get rid of redundant explicit casting)
Merging ipmi/for-next (fc26067c7417 ipmi: remove open coded version of SMBus block write)
Merging driver-core/driver-core-next (3e4c982f1ce7 Revert "driver core: Set fw_devlink=on by default")
Merging usb/usb-next (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.)
Merging usb-serial/usb-next (1542d1324be1 USB: serial: drop bogus to_usb_serial_port() checks)
Merging usb-chipidea-next/for-usb-next (1ee18ded86ec usb: cdnsp: Removes some useless trace events)
Merging tty/tty-next (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging char-misc/char-misc-next (d19db80a3665 spmi: spmi-pmic-arb: Fix hw_irq overflow)
CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
CONFLICT (content): Merge conflict in scripts/mod/devicetable-offsets.c
CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
CONFLICT (modify/delete): drivers/tty/n_tracesink.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/tty/n_tracesink.c left in tree.
CONFLICT (modify/delete): drivers/tty/n_tracerouter.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/tty/n_tracerouter.c left in tree.
$ git rm -f drivers/tty/n_tracerouter.c drivers/tty/n_tracesink.c
Merging extcon/extcon-next (bd30a35764e1 extcon: sm5502: Detect OTG when USB_ID is connected to ground)
Merging phy-next/next (d68f2cb09597 phy: cpcap-usb: Simplify bool conversion)
Merging soundwire/next (8d8d95842867 regmap: sdw-mbq: use MODULE_LICENSE("GPL"))
Merging thunderbolt/next (c6da62a219d0 thunderbolt: Add support for native USB4 _OSC)
Merging vfio/next (4d83de6da265 vfio/type1: Batch page pinning)
Merging staging/staging-next (3b9cdafb5358 Merge tag 'pinctrl-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging icc/icc-next (6715ea06ced4 Merge branch 'icc-sdx55' into icc-next)
Merging dmaengine/next (eda38ce482b2 dmaengine: dw-axi-dmac: remove redundant null check on desc)
Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next)
Merging scsi/for-next (89263dedffa2 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (f749d8b7a989 scsi: hpsa: Correct dev cmds outstanding for retried cmds)
Merging vhost/linux-next (2ec759d2fc93 vdpa_sim: Skip typecasting from void*)
Merging rpmsg/for-next (fcb4c469244b Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
Merging gpio-brgl/gpio/for-next (a8002a35935a gpio: pcf857x: Fix missing first interrupt)
Merging gpio-intel/for-next (c5318e248f52 gpio: msic: Drop driver from Makefile)
Merging pinctrl/for-next (b40b760aa2a9 pinctrl: mediatek: Fix trigger type setting follow for unexpected interrupt)
Merging pinctrl-intel/for-next (0e793a4e2834 pinctrl: tigerlake: Add Alder Lake-P ACPI ID)
Merging pinctrl-renesas/renesas-pinctrl (a5cda861ed57 pinctrl: renesas: r8a779a0: Add TPU pins, groups and functions)
Merging pinctrl-samsung/for-next (5c8fe583cce5 Linux 5.11-rc1)
Merging pwm/for-next (9a9dd7e47351 pwm: lpc18xx-sct: remove unneeded semicolon)
Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
Merging kselftest/next (e0c0840a46db selftests/seccomp: Accept any valid fd in user_notification_addfd)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (81840f21d416 Merge branch 'for-5.12/doc' into for-next)
Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection())
Merging rtc/rtc-next (49dfc1f16b03 rtc: abx80x: Add utility function for writing configuration key)
Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next)
Merging at24/at24/for-next (5366c48f327e dt-bindings: eeprom: at24: Document ROHM BR24G01)
Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1)
Merging seccomp/for-next/seccomp (a381b70a1cf8 seccomp: Improve performace by optimizing rmb())
Merging kspp/for-next/kspp (414eece95b98 Merge tag 'clang-lto-v5.12-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/f2fs/file.c
Merging gnss/gnss-next (45d5996e034c gnss: drop stray semicolons)
Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO)
Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h)
CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig
Merging nvmem/for-next (667fbb3fcde1 nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer)
Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders)
Merging hyperv/hyperv-next (3019270282a1 Revert "Drivers: hv: vmbus: Copy packets sent by Hyper-V out of the ring buffer")
Merging auxdisplay/auxdisplay (b45616445a6e auxdisplay: Fix duplicate CHARLCD config symbol)
Merging kgdb/kgdb/for-next (f11e2bc682cc kgdb: Remove kgdb_schedule_breakpoint())
Merging hmm/hmm (3650b228f83a Linux 5.10-rc1)
Merging fpga/for-next (e41d4c011706 fpga: dfl: fme: Constify static attribute_group structs)
Merging kunit/test (e71ba9452f0b Linux 5.11-rc2)
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver)
Merging kunit-next/kunit (7af29141a31a kunit: tool: fix unintentional statefulness in run_kernel())
Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
Merging mhi/mhi-next (9e04adfcab78 mhi: Fix double dma free)
Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all())
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
Merging iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (636b21b50152 PCI: Revoke mappings like devmem)
Merging oprofile-removal/oprofile/removal (be65de6b03aa fs: Remove dcookies support)
Merging akpm-current/current (12e9b8a3c276 initramfs-panic-with-memory-information-fix)
CONFLICT (content): Merge conflict in include/linux/pagemap.h
CONFLICT (content): Merge conflict in fs/hugetlbfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Applying: fs/ramfs/inode.c: update inode_operations.tmpfile
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (fafe5ef21130 MIPS: make userspace mapping young by default)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2020-02-24  4:32 Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2020-02-24  4:32 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 33802 bytes --]

Hi all,

Changes since 20200221:

The amlogic tree still had its build failure so I used a supplied patch.

The amdgpu tree gained a conflict against the drm tree.

The akpm-current tree still had its build failure for which I reverted
a series of commits.

Non-merge commits (relative to Linus' tree): 3139
 2996 files changed, 120000 insertions(+), 74176 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 315 trees (counting Linus' and 78 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 (d2eee25858f2 Merge tag 'for-5.6-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging fixes/master (ba954bf6cb38 evh_bytechan: fix out of bounds accesses)
Merging kbuild-current/fixes (743de36e106d kbuild: add comment for V=2 mode)
Merging arc-current/for-curr (3b00b042eeaa ARC: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
Merging arm-current/fixes (89604523a76e ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin)
Merging arm-soc-fixes/arm/fixes (3bf3c9744694 bus: moxtet: fix potential stack buffer overflow)
Merging arm64-fixes/for-next/fixes (dcde237319e6 mm: Avoid creating virtual address aliases in brk()/mmap()/mremap())
Merging m68k-current/for-linus (6aabc1facdb2 m68k: Implement copy_thread_tls())
Merging powerpc-fixes/fixes (9eb425b2e04e powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S)
Merging s390-fixes/fixes (2db01da8d25f s390/qdio: fill SBALEs with absolute addresses)
Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (39f3b41aa7ca net: genetlink: return the error code when attribute parsing fails.)
Merging bpf/master (41f57cfde186 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipsec/master (a1a7e3a36e01 xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire)
Merging netfilter/master (39f3b41aa7ca net: genetlink: return the error code when attribute parsing fails.)
Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs)
Merging wireless-drivers/master (a9149d243f25 iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices)
Merging mac80211/master (0daa63ed4c6c mac80211: Remove a redundant mutex unlock)
Merging rdma-fixes/for-rc (6affca140cbe RDMA/rw: Fix error flow during RDMA context initialization)
Merging sound-current/for-linus (c37c0ab02956 ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1)
Merging sound-asoc-fixes/for-linus (ecdb80c9a1ca Merge branch 'asoc-5.6' into asoc-linus)
Merging regmap-fixes/for-linus (d29456d34def Merge branch 'regmap-5.6' into regmap-linus)
Merging regulator-fixes/for-linus (507cca1fada1 Merge branch 'regulator-5.6' into regulator-linus)
Merging spi-fixes/for-linus (dae99f7b7251 Merge branch 'spi-5.6' into spi-linus)
Merging pci-current/for-linus (bb6d3fb354c5 Linux 5.6-rc1)
Merging driver-core.current/driver-core-linus (ae91c9256549 debugfs: remove return value of debugfs_create_regset32())
Merging tty.current/tty-linus (dca132a60f22 Merge tag 'ras-urgent-2020-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging usb.current/usb-linus (dca132a60f22 Merge tag 'ras-urgent-2020-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len)
Merging usb-serial-fixes/usb-linus (7c3d02285ad5 USB: serial: ch341: fix receiver regression)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (0ed41b33882c phy: brcm-sata: Correct MDIO operations for 40nm platforms)
Merging staging.current/staging-linus (dca132a60f22 Merge tag 'ras-urgent-2020-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging char-misc.current/char-misc-linus (dca132a60f22 Merge tag 'ras-urgent-2020-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging thunderbolt-fixes/fixes (da0f3e0201b8 MAINTAINERS: Sort entries in database for THUNDERBOLT)
Merging input-current/for-linus (3dbae1553897 Input: cyapa - replace zero-length array with flexible-array member)
Merging crypto-current/master (c9cc0517bba9 crypto: chacha20poly1305 - prevent integer overflow on large input)
Merging ide/master (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6)
Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base)
Merging kselftest-fixes/fixes (ef89d0545132 selftests/rseq: Fix out-of-tree compilation)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging slave-dma-fixes/fixes (2d0b1919457a dmaengine: idxd: correct reserved token calculation)
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
Merging mtd-fixes/mtd/fixes (def9d2780727 Linux 5.5-rc7)
Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
Merging v4l-dvb-fixes/fixes (1697d9812481 media: staging/intel-ipu3: remove TODO item about acronyms)
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (11479e8e3cd8 MIPS: ingenic: DTS: Fix watchdog nodes)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (e500ba0e71f0 Merge branch 'omap-for-v5.6/fixes-rc2' into fixes)
Merging kvm-fixes/master (ead68df94d24 KVM: x86: enable -Werror)
Merging kvms390-fixes/master (fe33a928bfcd KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups)
Merging hwmon-fixes/hwmon (675c7c3258d6 docs: adm1177: fix a broken reference)
Merging nvdimm-fixes/libnvdimm-fixes (96222d53842d dax: pass NOWAIT flag to iomap_apply)
Merging btrfs-fixes/next-fixes (5db834fa2a2b Merge branch 'misc-5.6' into next-fixes)
Merging vfs-fixes/fixes (bf4498ad3f9a tmpfs: deny and force are not huge mount options)
Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging samsung-krzk-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging devicetree-fixes/dt/linus (854bdbae9058 dt-bindings: media: csi: Fix clocks description)
Merging scsi-fixes/fixes (807b9515b7d0 scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session")
Merging drm-fixes/drm-fixes (97d9a4e9619a Merge tag 'drm-intel-fixes-2020-02-20' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (15de9cb5c9c8 drm/i915/gt: Avoid resetting ring->head outside of its timeline mutex)
Merging mmc-fixes/fixes (9051db381fab mmc: sdhci-msm: Mark sdhci_msm_cqe_disable static)
Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging gnss-fixes/gnss-linus (bb6d3fb354c5 Linux 5.6-rc1)
Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (e7167043ee50 riscv: Fix gitignore)
Merging pidfd-fixes/fixes (0bef168e8859 exit: Fix Sparse errors and warnings)
Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
Merging spdx/spdx-linus (bb6d3fb354c5 Linux 5.6-rc1)
Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging pinctrl-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1)
Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2)
Merging drm-misc-fixes/for-linux-next-fixes (dde2bb2da01e drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context)
Merging kspp-gustavo/for-next/kspp (d5180902be1c firmware: google: vpd: Replace zero-length array with flexible-array member)
Merging kbuild/for-next (5693febe8be8 kbuild: remove wrong documentation about mandatory-y)
Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (75467ee48a5e dma-direct: improve DMA mask overflow reporting)
Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
Merging arm/for-next (c0cf33e910fe Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (e533dbe9dcb1 arm64: acpi: fix DAIF manipulation with pNMI)
Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform)
Merging arm-soc/for-next (f07849b2ac77 ARM: Document merges)
Merging amlogic/for-next (7ef59ea6bce0 Merge branch 'v5.7/drivers' into tmp/aml-rebuild)
Applying: soc: amlogic: fix compile failure with MESON_SECURE_PM_DOMAINS & !MESON_SM
Merging aspeed/for-next (5a020d80bbef ARM: dts: aspeed: g4: add video engine support)
Merging at91/at91-next (1c8bb10f82fb Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging imx-mxs/for-next (605ee38a3bbe Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a1766a49fc90 Merge tag 'drivers_soc_for_5.6' into next)
Merging mediatek/for-next (faf3024a8ea2 Merge branch 'v5.6-next/soc' into for-next)
Merging mvebu/for-next (c0d03b53ef47 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (e500ba0e71f0 Merge branch 'omap-for-v5.6/fixes-rc2' into fixes)
Merging qcom/for-next (bc50f20a31b1 Merge branches 'arm64-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next)
Merging raspberrypi/for-next (ec3d259408ce ARM: bcm2835_defconfig: add support for Raspberry Pi4)
Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next)
Merging renesas/next (7d21c0efac2a Merge branch 'renesas-drivers-for-v5.7' into renesas-next)
Merging reset/reset/next (4e0b9bc98c4a dt-bindings: reset: meson: add gxl internal dac reset)
Merging rockchip/for-next (152f9a049efc Merge branch 'v5.6-clk/fixes' into for-next)
Merging samsung-krzk/for-next (0c09ac8e27a0 Merge branch 'next/dt' into for-next)
Merging scmi/for-linux-next (11a48a5a18c6 Linux 5.6-rc2)
Merging sunxi/sunxi/for-next (766f0641aba8 Merge branch 'sunxi/dt-for-5.7' into sunxi/for-next)
Merging tegra/for-next (56568eebf45e Merge branch for-5.7/arm64/dt into for-next)
Merging clk/clk-next (931cfff0458a Merge branch 'clk-socfpga' into clk-next)
Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-rc1)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (99db590b083f csky: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers)
Merging m68k/for-next (dff527e7a0a8 m68k: Switch to asm-generic/hardirq.h)
Merging m68knommu/for-next (11a48a5a18c6 Linux 5.6-rc2)
Merging microblaze/next (6aa71ef9bcf9 microblaze: Add ID for Microblaze v11)
Merging mips/mips-next (91f40e896444 mips/jazz: Update jazz_defconfig for MIPS Magnum)
Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE)
Merging nios2/for-next (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address)
Merging openrisc/for-next (fc74d7166005 openrisc: use mmgrab)
Merging parisc-hd/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging powerpc/next (71c3a888cbca Merge tag 'powerpc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (6a7f10c79574 soc: fsl: dpio: fix dereference of pointer p before null check)
Merging risc-v/for-next (704dd3cad2e6 RISC-V: Stop putting .sbss in .sdata)
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (b059a39cfa27 s390/arch: install kernels with their proper version ID)
Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay)
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging uml/linux-next (d65197ad5249 um: Fix time-travel=inf-cpu with xor/raid6)
Merging xtensa/xtensa-for-next (362961f4063f Merge branch 'xtensa-5.6-fixes' into xtensa-for-next)
Merging fscrypt/master (edc440e3d27f fscrypt: improve format of no-key names)
Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret')
Merging btrfs/for-next (f62e2374c142 Merge branch 'for-next-next-v5.6-20200221' into for-next-20200221)
Merging ceph/master (3b20bc2fe4c0 ceph: noacl mount option is effectively ignored)
Merging cifs/for-next (617ba0c0ac57 cifs: handle prefix paths in reconnect)
Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item)
Merging ecryptfs/next (2c2a7552dd64 ecryptfs: replace BUG_ON with error handling code)
Merging erofs/dev (bb6d3fb354c5 Linux 5.6-rc1)
Merging ext3/for_next (daf1cd925487 Pull macro cleanup patches.)
Merging ext4/dev (9db176bceb5c ext4: fix mount failure with quota configured as module)
Merging f2fs/dev (b19e8c684703 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging fsverity/fsverity (da3a3da4e6c6 fs-verity: use u64_to_user_ptr())
Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return)
Merging jfs/jfs-next (802a5017ffb2 jfs: remove unused MAXL2PAGES)
Merging nfs/linux-next (11a48a5a18c6 Linux 5.6-rc2)
Merging nfs-anna/linux-next (5d63944f8206 NFSv4: Ensure the delegation cred is pinned when we call delegreturn)
Merging nfsd/nfsd-next (3d96208c30f8 sunrpc: expiry_time should be seconds not timeval)
Merging orangefs/for-next (9f198a2ac543 help_next should increase position index)
Merging overlayfs/overlayfs-next (c2e87fd93396 ovl: allow remote upper)
Merging ubifs/linux-next (fe357dbae113 ubi: Fix an error pointer dereference in error handling code)
Merging v9fs/9p-next (79fb9216b7be 9p: Remove unneeded semicolon)
Merging xfs/for-next (cdbcf82b86ea xfs: fix xfs_buf_ioerror_alert location reporting)
Merging zonefs/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging iomap/iomap-for-next (243145bc4336 fs: Fix page_mkwrite off-by-one errors)
Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space)
Merging file-locks/locks-next (98ca480a8f22 locks: print unsigned ino in /proc/locks)
Merging vfs/for-next (0fd169576648 fs: Add VirtualBox guest shared folder (vboxsf) support)
Merging printk/for-next (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next)
Merging pci/next (daf98fffe4dc Merge branch 'pci/misc')
Merging pstore/for-next/pstore (e163fdb3f7f8 pstore/ram: Regularize prz label allocation lifetime)
Merging hid/for-next (530c6c3b37e2 Merge branch 'for-5.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging i3c/i3c/next (de8964995c79 i3c: master: no need to iterate master device twice)
Merging dmi/master (6eaaa9e89719 firmware/dmi: Report DMI Bios & EC firmware release)
Merging hwmon-staging/hwmon-next (5c8507ffe058 hwmon: (lm73) Add support for of_match_table)
Merging jc_docs/docs-next (e2c79ab7d75b tools/edid: Move EDID data sets from Documentation/)
Merging v4l-dvb/master (bb6d3fb354c5 Linux 5.6-rc1)
Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (c6cef55cdff7 Merge branch 'pm-sleep' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (a30f8a91f3c2 cpufreq: imx-cpufreq-dt: Add "cpu-supply" property check)
Merging cpupower/cpupower (bb6d3fb354c5 Linux 5.6-rc1)
Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter)
Merging thermal/thermal/linux-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
Merging rdma/for-next (f03d9fadfe13 RDMA/core: Add weak ordering dma attr to dma mapping)
Merging net-next/master (2045e158fc7f r8169: remove RTL_EVENT_NAPI constants)
Merging bpf-next/master (8eece07c011f Merge tag 'sched-for-bpf-2020-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into bpf-next)
Merging ipsec-next/master (dda520c4d462 ESP: Export esp_output_fill_trailer function)
Merging mlx5-next/mlx5-next (339ffae598ed net/mlx5e: Replace zero-length array with flexible-array member)
Merging netfilter-next/master (d5110b5d84d3 netfilter: cleanup unused macro)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c
Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook)
Merging wireless-drivers-next/master (932183aa35c6 mwifiex: change license text from MARVELL to NXP)
Merging bluetooth/master (eed467b517e8 Bluetooth: fix passkey uninitialized when used)
Merging mac80211-next/master (7bb106eb6891 cfg80211: remove support for adjacent channel compensation)
Merging gfs2/for-next (6e5e41e2dc4e gfs2: fix O_SYNC write handling)
Merging mtd/mtd/next (4575243c5c17 Merge tag 'nand/for-5.6' into mtd/next)
Merging nand/nand/next (d85339d9ea26 mtd: onenand: Rename omap2 driver to avoid a build warning)
Merging spi-nor/spi-nor/next (df5c21002cf4 mtd: spi-nor: use spi-mem dirmap API)
Merging crypto/master (ff462ddfd95b crypto: chelsio - Endianess bug in create_authenc_wr)
Merging drm/drm-next (1b245ec5b685 Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging amdgpu/drm-next (67ceb5261709 drm/amdgpu: add sysfs interface to set arbitrary sclk value for navi14)
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-intel/for-linux-next (bb393dc56e9a drm/i915/display/hdcp: Make WARN* drm specific where drm_priv ptr is available)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/mock_engine.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c
Merging drm-tegra/drm/tegra/for-next (98ae41adb252 gpu: host1x: Set DMA direction only for DMA-mapped buffer objects)
Merging drm-misc/for-linux-next (e1cf35b94c5f drm/edid: fix building error)
Merging drm-msm/msm-next (5f9935f514d6 drm/msm: Fix error about comments within a comment block)
Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells)
Merging regmap/for-next (d29456d34def Merge branch 'regmap-5.6' into regmap-linus)
Merging sound/for-next (2948f4a4e583 Merge branch 'topic/usb-uac2-effect-unit' into for-next)
Merging sound-asoc/for-next (dcdf428d1e18 Merge branch 'asoc-5.7' into asoc-next)
Merging modules/modules-next (0f74226649fb kernel: module: Replace zero-length array with flexible-array member)
Merging input/next (c5ccf2ad3d33 Input: synaptics-rmi4 - switch to reduced reporting mode)
Merging block/for-next (6b6eb301e976 Merge branch 'io_uring-5.6' into for-next)
Merging device-mapper/for-next (47ace7e012b9 dm: fix potential for q->make_request_fn NULL pointer)
Merging pcmcia/pcmcia-next (71705c611263 PCMCIA/i82092: remove #if 0 block)
Merging mmc/next (b6559a9563d6 mmc: host: hsq: Add missing MODULE_LICENSE() and MODULE_DESCRIPTION())
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (5312f321a67c mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy)
Merging backlight/for-backlight-next (7af43a76695d backlight: qcom-wled: Fix unsigned comparison to zero)
Merging battery/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging regulator/for-next (5932ad6367d1 Merge branch 'regulator-5.7' into regulator-next)
Merging security/next-testing (3e27a33932df security: remove duplicated include from security.h)
Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.)
Merging integrity/next-integrity (5780b9abd530 ima: add sm3 algorithm to hash algorithm configuration list)
Merging keys/keys-next (bda7978b1956 Merge branch 'keys-acl' into keys-next)
CONFLICT (content): Merge conflict in fs/pipe.c
Merging selinux/next (e4cfa05e9bfe selinux: Add xfs quota command types)
CONFLICT (content): Merge conflict in security/selinux/ss/services.c
CONFLICT (content): Merge conflict in security/selinux/include/security.h
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
Merging tomoyo/master (bb6d3fb354c5 Linux 5.6-rc1)
Merging tpmdd/next (c706e6eb615b tpm: Don't make log failures fatal)
Merging watchdog/master (44144c809e39 watchdog: da9062: Add dependency on I2C)
Merging iommu/next (e3b5ee0cfb65 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging vfio/next (7b5372ba04ca vfio: platform: fix __iomem in vfio_platform_amdxgbe.c)
Merging audit/next (70b3eeed49e8 audit: CONFIG_CHANGE don't log internal bookkeeping as an event)
Merging devicetree/for-next (faf8e30acb21 dt-bindings: arm: Add kryo260 compatible)
CONFLICT (modify/delete): Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt left in tree.
$ git rm -f Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt
Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu)
Merging spi/for-next (5c7867000487 Merge branch 'spi-5.7' into spi-next)
Merging tip/auto-latest (f4a4fb5f1572 Merge branch 'core/objtool')
Merging clockevents/timers/drivers/next (e4c3b4213b79 clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSC)
CONFLICT (content): Merge conflict in drivers/clocksource/hyperv_timer.c
Merging edac/edac-for-next (c7f7b1c8feca Merge branch 'edac-drivers' into edac-for-next)
Merging irqchip/irq/irqchip-next (5186a6cc3ef5 irqchip/gic-v3-its: Rename VPENDBASER/VPROPBASER accessors)
Merging ftrace/for-next (7276531d4036 tracing: Consolidate trace() functions)
Merging rcu/rcu/next (8aa63de65a79 kcsan: Add option for verbose reporting)
Merging kvm/linux-next (ead68df94d24 KVM: x86: enable -Werror)
Merging kvm-arm/next (e43f1331e2ef arm64: Ask the compiler to __always_inline functions used by KVM at HYP)
Merging kvm-ppc/kvm-ppc-next (fd24a8624eb2 KVM: PPC: Book3S PR: Fix -Werror=return-type build failure)
Merging kvms390/next (b35e8878e1d3 KVM: s390/interrupt: do not pin adapter interrupt pages)
Merging xen-tip/linux-next (8645e56a4ad6 xen: Enable interrupts when calling _cond_resched())
Merging percpu/for-next (9391e7a9a1e2 Merge branch 'for-5.6' into for-next)
Merging workqueues/for-next (1cd27003497a workqueue: don't use wq_select_unbound_cpu() for bound works)
Merging drivers-x86/for-next (7adb1e8aeeb5 platform/x86: intel_pmc_core: Add debugfs support to access live status registers)
Merging chrome-platform/for-next (42cd0ab476e2 platform/chrome: cros_ec: Query EC protocol version if EC transitions between RO/RW)
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging leds/for-next (11a48a5a18c6 Linux 5.6-rc2)
Merging ipmi/for-next (ef0129a4d06a drivers: char: ipmi: ipmi_msghandler: Pass lockdep expression to RCU lists)
Merging driver-core/driver-core-next (99c73ce158a4 drivers base/arch_topology: Reformat topology_get_[cpu/freq]_scale() function name)
Merging usb/usb-next (2f41c8a25feb usb: musb: core: remove useless cast for driver.name)
Merging usb-gadget/next (bb6d3fb354c5 Linux 5.6-rc1)
Merging usb-serial/usb-next (2c0bee081315 USB: serial: digi_acceleport: remove redundant assignment to pointer priv)
Merging usb-chipidea-next/ci-for-usb-next (220fd9c3bf5b usb: chipidea: udc: using structure ci_hdrc device for runtime PM)
Merging phy-next/next (a5c86c557fe9 phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval)
Merging tty/tty-next (e587e8f17433 vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines)
Merging char-misc/char-misc-next (06e33595e96f misc: Use kzalloc() instead of kmalloc() with flag GFP_ZERO.)
Merging extcon/extcon-next (87ccafd3bd64 extcon: palmas: Hide error messages if gpio returns -EPROBE_DEFER)
Merging soundwire/next (eff346f24ba9 soundwire: intel: free all resources on hw_free())
Merging thunderbolt/next (3084ea9ea889 thunderbolt: icm: Replace zero-length array with flexible-array member)
Merging staging/staging-next (55b9b8f67d93 staging: fsl-dpaa2: ethsw: ethsw.c: Fix line over 80 characters)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging slave-dma/next (35e032462bf8 dmanegine: ioat/dca: Replace zero-length array with flexible-array member)
Merging cgroup/for-next (9bd5910d7f3d selftests/cgroup: add tests for cloning into cgroups)
Merging scsi/for-next (0a65b349c7fa Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (b417107a659e scsi: advansys: Replace zero-length array with flexible-array member)
Merging vhost/linux-next (370e2c82a4a5 vhost: use batched version by default)
Merging rpmsg/for-next (5a87e60312a9 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (53803ecac78b Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (cb548e981da5 gpiolib: Rename 'event' to 'ge' to be consistent with other use)
Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging pinctrl/for-next (c93214689f0c MAINTAINERS: Sort entries in database for PIN CONTROLLER)
Merging pinctrl-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging pwm/for-next (9871abffc810 pwm: Remove set but not set variable 'pwm')
Merging userns/for-next (61a47c1ad3a4 sysctl: Remove the sysctl system call)
Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig)
Merging random/dev (4cb760b02419 s390x: Mark archrandom.h functions __must_check)
Merging kselftest/next (3032e3a7c7e3 selftests/resctrl: Add the test in MAINTAINERS)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next)
Merging coresight/next (bb6d3fb354c5 Linux 5.6-rc1)
Merging rtc/rtc-next (4594d082dbe6 rtc: zynqmp: Clear alarm interrupt status before interrupt enable)
Merging nvdimm/libnvdimm-for-next (7b27a8622f80 libnvdimm/e820: Retrieve and populate correct 'target_node' info)
Merging at24/at24/for-next (4837621cd61e eeprom: at24: add TPF0001 ACPI ID for 24c1024 device)
Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status)
Merging kspp/for-next/kspp (c79f46a28239 Linux 5.5-rc5)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values)
CONFLICT (content): Merge conflict in drivers/fsi/Kconfig
Merging slimbus/for-next (526eaf5d08a2 slimbus: Use the correct style for SPDX License Identifier)
Merging nvmem/for-next (8daa31303194 nvmem: release the write-protect pin)
Merging xarray/xarray (3a00e7c47c38 ida: remove abandoned macros)
Merging hyperv/hyperv-next (54e19d34011f hv_utils: Add the support of hibernation)
Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1)
Merging kgdb/kgdb/for-next (5ea771abd5a3 kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ)
Merging pidfd/for-next (8d19f1c8e193 prctl: PR_{G,S}ET_IO_FLUSHER to support controlling memory reclaim)
Merging devfreq/devfreq-next (46dbfe265841 PM / devfreq: Fix a typo in a comment)
Merging hmm/hmm (bb6d3fb354c5 Linux 5.6-rc1)
Merging fpga/for-next (309db92e29b1 fpga: zynq: Remove clk_get error message for probe defer)
Merging kunit/test (bb6d3fb354c5 Linux 5.6-rc1)
Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6)
Merging kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations)
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
Merging kunit-next/kunit (be886ba90cce kunit: run kunit_tool from any directory)
Merging akpm-current/current (f8740ac91f9f init/Kconfig: clean up ANON_INODES and old IO schedulers options)
CONFLICT (content): Merge conflict in arch/m68k/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild
Applying: Revert "net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix"
Applying: Revert "net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy"
Applying: Revert "add missing page_count() check to vm_insert_pages()."
Applying: Revert "mm-add-vm_insert_pages-fix"
Applying: Revert "mm/memory.c: add vm_insert_pages()"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm/frontswap: mark various intentional data races
Applying: mm/page_io: mark various intentional data races
Applying: mm-page_io-mark-various-intentional-data-races-v2
Applying: mm/swap_state: mark various intentional data races
Applying: mm/kmemleak: annotate various data races obj->ptr
Applying: mm/filemap.c: fix a data race in filemap_fault()
Applying: mm/swapfile: fix and annotate various data races
Applying: mm-swapfile-fix-and-annotate-various-data-races-v2
Applying: mm/page_counter: fix various data races at memsw
Applying: mm/memcontrol: fix a data race in scan count
Applying: mm/list_lru: fix a data race in list_lru_count_one
Applying: mm/mempool: fix a data race in mempool_free()
Applying: mm/util.c: annotate an data race at vm_committed_as
Applying: mm/rmap: annotate a data race at tlb_flush_batched
Applying: mm: annotate a data race in page_zonenum()
Applying: drivers/tty/serial/sh-sci.c: suppress warning
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (46fcdb47d1f9 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2017-02-24  3:01 Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2017-02-24  3:01 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Please do not add any material intended for v4.12 to your linux-next
included branches until after v4.11-rc1 has been released.

Changes since 20170223:

The drm tree gained a conflict against Linus' tree and a build failure,
so I used the version from next-20170223.

The scsi tree still has its build failure, so I used the version from
next-20170222.

The scsi-mkp tree lost its build failure.

Non-merge commits (relative to Linus' tree): 3279
 3462 files changed, 145342 insertions(+), 62837 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 253 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 (60e8d3e11645 Merge tag 'pci-v4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging fixes/master (c470abd4fde4 Linux 4.10)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
Merging arm-current/fixes (9e3440481845 ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user())
Merging m68k-current/for-linus (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (3f91a89d424a powerpc/64: Disable use of radix under a hypervisor)
Merging sparc/master (cd429ce2d095 sparc64: memblock resizes are not handled properly)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (9c4713701c01 bpf: Fix bpf_xdp_event_output)
Merging ipsec/master (e3dc847a5f85 vti6: Don't report path MTU below IPV6_MIN_MTU.)
Merging netfilter/master (47b1f6fd6ebc uapi: stop including linux/sysctl.h in uapi/linux/netfilter.h)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (8a96bb837818 mac80211: don't reorder frames with SN smaller than SSN)
Merging sound-current/for-linus (7086b7b3d101 ALSA: usb-audio: Tidy up mixer_us16x08.c)
Merging pci-current/for-linus (afe3e4d11bdf PCI/PME: Restore pcie_pme_driver.remove)
Merging driver-core.current/driver-core-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging tty.current/tty-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging char-misc.current/char-misc-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging input-current/for-linus (6e11617fcff3 Merge branch 'next' into for-linus)
Merging crypto-current/master (12cb3a1c4184 crypto: xts - Add ECB dependency)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
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 mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (9eeb0ed0f309 [media] mtk-vcodec: fix build warnings without DEBUG)
Merging drm-intel-fixes/for-linux-next-fixes (c470abd4fde4 Linux 4.10)
Merging drm-misc-fixes/for-linux-next-fixes (bb08c04dc867 drm/dp/mst: fix kernel oops when turning off secondary monitor)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (85593554fb35 Merge branch 'fixes' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (93f0a7522a39 arm-soc: document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
CONFLICT (content): Merge conflict in arch/arm/configs/aspeed_g5_defconfig
Merging amlogic/for-next (2452b94d227c Merge v4.11/dt64)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (f5fde64706f0 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (e8ba6e4b2558 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (2b6a9eabd44e Merge branch 'omap-for-v4.10/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (10e459de8497 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (ffe7afd17135 arm64/kprobes: consistently handle MRS/MSR with XZR)
Merging clk/clk-next (f59de563358e clk: renesas: mstp: ensure register writes complete)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
Merging m68knommu/for-next (73ec49463f89 m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (ada1bd978bf3 MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (20913e0a776d openrisc: head: Init r0 to 0 on start)
CONFLICT (content): Merge conflict in arch/openrisc/include/asm/Kbuild
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (3dbbaf200f53 powerpc/pseries: Advertise Hot Plug Event support to firmware)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/asm-offsets.c
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (8693b9145b13 s390/dasd: fix spelling mistake: "supportet" -> "supported")
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (6f69f0ed6136 fscrypt: constify struct fscrypt_operations)
Merging befs/for-next (7ce7d89f4883 Linux 4.10-rc1)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (d46996f6537a Merge branch 'for-next-current-v4.10-20170220' into for-next-20170220)
Merging ceph/master (f10754803980 ceph: tidy some white space in get_nonsnap_parent())
Merging cifs/for-next (2bfe01eff430 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (6c71100db53e fanotify: simplify the code of fanotify_merge)
Merging ext4/dev (cab7076a185e Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging f2fs/dev (567d4ce18b37 f2fs: remove unnecessary condition check for write_checkpoint in f2fs_gc)
CONFLICT (content): Merge conflict in fs/f2fs/super.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (9a87ad3da905 fuse: release: private_data cannot be NULL)
Merging gfs2/for-next (5bcbe22ca47d Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (c470abd4fde4 Linux 4.10)
Merging nfsd/nfsd-next (0e954b1e9d2c nfsd: special case truncates some more)
Merging orangefs/for-next (eb68d0324dc4 orangefs: fix buffer size mis-match between kernel space and user space.)
Merging overlayfs/overlayfs-next (51f8f3c4e225 ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (8d242e932fb7 xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param)
Merging pci/next (c4d052ce970e Merge branch 'pci/virtualization' into next)
Merging pstore/for-next/pstore (fc1b326efd27 MAINTAINERS: Adjust pstore git repo URI, add files)
Merging hid/for-next (b03fa3ca9c90 Merge branch 'for-4.11/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (ce3496c8d5ff Merge branch 'i2c/for-4.11' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (2f1736ff0664 hwmon: (sht15) Add device tree support)
Merging jc_docs/docs-next (bd8562626c8e docs / driver-api: Fix structure references in device_link.rst)
Merging v4l-dvb/master (e6b377dbbb94 Merge tag 'v4.10' into patchwork)
Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (42f82367df2c video: fbdev: fsl-diu-fb: fix spelling mistake "palette")
Merging pm/linux-next (14a05f0baaf1 Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (6fefe19f5836 Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (ca78d3173cff Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging ipsec-next/master (7785bba299a8 esp: Add a software GRO codepath)
Merging netfilter-next/master (ca78d3173cff Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (4e33e3462510 tcp: use page_ref_inc() in tcp_sendmsg())
Merging bluetooth/master (8f91566f99fa btmrvl: fix spelling mistake: "actived" -> "activated")
Merging mac80211-next/master (40beeb3c9b01 mac80211: shorten debug message)
Merging rdma/for-next (9294000d6d89 IB/srp: Drain the send queue before destroying a QP)
Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id)
Merging spi-nor/next (7fa2c7038cc0 mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (12cb3a1c4184 crypto: xts - Add ECB dependency)
Merging drm/drm-next (1e8ad3d8da47 Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/linux/kref.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
$ git reset --hard HEAD^
Merging next-20170223 version of drm
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in include/linux/kref.h
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sprite.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
[master acb209605f0d] next-20170223/drm
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (998d75730b40 drm/i915: Fix not finding the VBT when it overlaps with OPREGION_ASLE_EXT)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (efe0220fc2d2 drm/rockchip: cdn-dp: Fix error handling)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging kspp/for-next/kspp (965049b782ec Merge branch 'for-next/usercopy' into for-next/kspp)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (7086b7b3d101 ALSA: usb-audio: Tidy up mixer_us16x08.c)
Merging sound-asoc/for-next (141dee78c40a Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (0d4ec7849f5a MAINTAINERS: add tree for modules)
Merging input/next (a685f48cf6bc Merge branch 'tsc2007' into next)
Merging block/for-next (3695539290d7 Merge branch 'for-4.11/block' into for-next)
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (d67a5f4b5947 dm: flush queued bios when process blocks to avoid deadlock)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (8c7cdbf9272c mmc: core: add mmc prefix for blk_fixups)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (1ec492232ed6 md/raid1: fix write behind issues introduced by bio_clone_bioset_partial)
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (e93c10211d03 mfd: lpc_ich: Enable watchdog on Intel Apollo Lake PCH)
Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (877fe823a0ad Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (61841be6358c tpm: declare tpm2_get_pcr_allocation() as static)
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (61841be6358c tpm: declare tpm2_get_pcr_allocation() as static)
Merging tpmdd/next (61841be6358c tpm: declare tpm2_get_pcr_allocation() as static)
Merging watchdog/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail)
Merging iommu/next (8d2932dd0634 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (d9d84780f17c vfio: fix a typo in comment of function vfio_pin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (fe8e52b9b910 audit: remove unnecessary curly braces from switch/case statements)
Merging devicetree/for-next (4e29ccdb240e DT: add Faraday Tec. as vendor)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (827498a19804 Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (d6f6b3f1e69d Merge branch 'perf/urgent' into auto-latest)
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (add/add): Merge conflict in drivers/edac/edac_mc.h
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (add/add): Merge conflict in Documentation/admin-guide/ras.rst
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (75bf2f6478ca EDAC, mce_amd: Print IPID and Syndrome on a separate line)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (3962d9226404 Merge branch 'for-next/ftrace/core' into temp)
Merging rcu/rcu/next (31945aa9f140 Merge branches 'doc.2017.01.15b', 'dyntick.2017.01.23a', 'fixes.2017.01.23a', 'srcu.2017.01.25a' and 'torture.2017.01.15b' into HEAD)
Merging kvm/linux-next (fd7e9a883484 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (bcd3bb63dbc8 KVM: PPC: Book3S HV: Disable HPT resizing on POWER9 for now)
Merging kvms390/next (260a1d6afe2e KVM: s390: log runtime instrumentation enablement)
Merging xen-tip/linux-next (4610d240d691 xen/privcmd: add IOCTL_PRIVCMD_RESTRICT)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (db40b056f862 platform/x86: intel_turbo_max_3: make it explicitly non-modular)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (fb3d769173d2 leds: ledtrig-heartbeat: Make top brightness adjustable)
Merging ipmi/for-next (eb994594bc22 ipmi: bt-bmc: Use a regmap for register access)
Merging driver-core/driver-core-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging usb/usb-next (0df8a3dbacb5 Merge tag 'usb-serial-4.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (beabdc3cd3e3 USB: serial: keyspan: drop header file)
Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe())
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging tty/tty-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging char-misc/char-misc-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging extcon/extcon-next (3573d97d840c extcon: palmas: Don't miss GPIO events during suspend/resume)
Merging staging/staging-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew))
Merging slave-dma/next (235840692925 Merge branch 'fixes' into next)
Merging cgroup/for-next (f83f3c515654 kernfs: fix locking around kernfs_ops->release() callback)
Merging scsi/for-next (9880e90e1ab8 Merge branch 'misc' into for-next)
$ git reset --hard HEAD^
Merging next-20170222 version of scsi
Merging scsi-mkp/for-next (2559a1ef688f scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m)
Merging target-updates/for-next (6c3918e2f401 target: Fix NULL dereference during LUN lookup + active I/O shutdown)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (349709ba5bea Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (3498d8694d41 gpio: reintroduce devm_get_gpiod_from_child())
Merging pinctrl/for-next (baafacab092e pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data())
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (ace0c791e6c3 proc/sysctl: Don't grab i_lock under sysctl_lock.)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (68bd42d97c30 selftests/powerpc: Fix remaining fallout from recent changes)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (dc83e0549ea1 coresight: Fixes coresight DT parse to get correct output port ID.)
Merging rtc/rtc-next (3769a375ab83 rtc: pcf2127: bulk read only date and time registers.)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (768dd325a382 radix tree test suite: Run iteration tests for longer)
Merging akpm-current/current (8edc7b56f752 scatterlist: do not disable IRQs in sg_copy_buffer)
CONFLICT (content): Merge conflict in include/linux/iomap.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/iomap.c
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Applying: mm: add arch-independent testcases for RODATA
Applying: mm: testcases for RODATA: fix config dependency
Merging akpm/master (bfd13a4d30bd mm: testcases for RODATA: fix config dependency)

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2016-03-17 10:27       ` Stephen Rothwell
@ 2016-03-17 10:37         ` Sedat Dilek
  0 siblings, 0 replies; 30+ messages in thread
From: Sedat Dilek @ 2016-03-17 10:37 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Benjamin LaHaise, linux-next, LKML, linux-aio

On Thu, Mar 17, 2016 at 11:27 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Sedat,
>
> On Thu, 17 Mar 2016 11:21:56 +0100 Sedat Dilek <sedat.dilek@gmail.com> wrote:
>>
>> not seeing this anymore.
>> How was that solved?
>
> The code has been removed while it is further worked on and reviewed
> and may reappear after -rc1 is released.
>

Thanks!

- sed@ -

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2016-03-17 10:21     ` Sedat Dilek
@ 2016-03-17 10:27       ` Stephen Rothwell
  2016-03-17 10:37         ` Sedat Dilek
  0 siblings, 1 reply; 30+ messages in thread
From: Stephen Rothwell @ 2016-03-17 10:27 UTC (permalink / raw)
  To: Sedat Dilek; +Cc: Benjamin LaHaise, linux-next, LKML, linux-aio

Hi Sedat,

On Thu, 17 Mar 2016 11:21:56 +0100 Sedat Dilek <sedat.dilek@gmail.com> wrote:
>
> not seeing this anymore.
> How was that solved?

The code has been removed while it is further worked on and reviewed
and may reappear after -rc1 is released.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2016-02-24 14:37   ` Benjamin LaHaise
@ 2016-03-17 10:21     ` Sedat Dilek
  2016-03-17 10:27       ` Stephen Rothwell
  0 siblings, 1 reply; 30+ messages in thread
From: Sedat Dilek @ 2016-03-17 10:21 UTC (permalink / raw)
  To: Benjamin LaHaise; +Cc: linux-next, LKML, Stephen Rothwell, linux-aio

On Wed, Feb 24, 2016 at 3:37 PM, Benjamin LaHaise <bcrl@kvack.org> wrote:
> On Wed, Feb 24, 2016 at 07:32:17AM +0100, Sedat Dilek wrote:
>> On Wed, Feb 24, 2016 at 6:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > Hi all,
>> >
>> > Changes since 20160223:
>> >
>> ...
>> > The aio tree still had a build failure so I used the version from
>> > next-20160111.
>> >
>>
>> Might be good to poke the maintainer as I am seeing this for a long
>> time in Linux-next.
>
> These are architecture code related build failures that arch maintainers
> need to fix.  Avoiding pulling the tree allows people to ignore the issue,
> which isn't going to get things fixed.  I provided an example how to
> implement the 64 bit __get_user() without generating warnings, and it is
> now up to maintainers to adapt it for their architecture.
>

Hi Ben,

not seeing this anymore.
How was that solved?

Regards,
- Sedat -

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2016-02-24  6:32 ` Sedat Dilek
@ 2016-02-24 14:37   ` Benjamin LaHaise
  2016-03-17 10:21     ` Sedat Dilek
  0 siblings, 1 reply; 30+ messages in thread
From: Benjamin LaHaise @ 2016-02-24 14:37 UTC (permalink / raw)
  To: Sedat Dilek; +Cc: linux-next, LKML, Stephen Rothwell, linux-aio

On Wed, Feb 24, 2016 at 07:32:17AM +0100, Sedat Dilek wrote:
> On Wed, Feb 24, 2016 at 6:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > Changes since 20160223:
> >
> ...
> > The aio tree still had a build failure so I used the version from
> > next-20160111.
> >
> 
> Might be good to poke the maintainer as I am seeing this for a long
> time in Linux-next.

These are architecture code related build failures that arch maintainers 
need to fix.  Avoiding pulling the tree allows people to ignore the issue, 
which isn't going to get things fixed.  I provided an example how to 
implement the 64 bit __get_user() without generating warnings, and it is 
now up to maintainers to adapt it for their architecture.

		-ben

> - Sedat -

-- 
"Thought is the essence of where you are now."

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2016-02-24  5:34 Stephen Rothwell
@ 2016-02-24  6:32 ` Sedat Dilek
  2016-02-24 14:37   ` Benjamin LaHaise
  0 siblings, 1 reply; 30+ messages in thread
From: Sedat Dilek @ 2016-02-24  6:32 UTC (permalink / raw)
  To: Benjamin LaHaise; +Cc: linux-next, LKML, Stephen Rothwell, linux-aio

On Wed, Feb 24, 2016 at 6:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Changes since 20160223:
>
...
> The aio tree still had a build failure so I used the version from
> next-20160111.
>

Might be good to poke the maintainer as I am seeing this for a long
time in Linux-next.

- Sedat -

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2016-02-24  5:34 Stephen Rothwell
  2016-02-24  6:32 ` Sedat Dilek
  0 siblings, 1 reply; 30+ messages in thread
From: Stephen Rothwell @ 2016-02-24  5:34 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Changes since 20160223:

The arc tree gained conflicts against the arc-current tree.

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

The mac80211-next tree gained a build failure so I used the version
from next-20160223.

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

The aio tree still had a build failure so I used the version from
next-20160111.

Non-merge commits (relative to Linus' tree): 6570
 5356 files changed, 246127 insertions(+), 121346 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 36 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 (4de8ebeff8dd Merge tag 'trace-fixes-v4.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (0443ad7fb2eb ARC: SMP: No need for CONFIG_ARC_IPI_DBG)
Merging arm-current/fixes (c7edd7f99cda ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs)
Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
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 (6ecad912a007 powerpc/ioda: Set "read" permission when "write" is set)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (fb5eb24cdd5c Add Dell Wireless 5809e Gobi 4G HSPA+ Mobile Broadband Card (rev3) to qmi_wwan)
Merging ipsec/master (3ed01df4ff79 xfrm: Reset encapsulation field of the skb before transformation)
Merging ipvs/master (5acaf89f88b9 netfilter: ipvs: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers/master (c699404db182 Merge tag 'iwlwifi-for-kalle-2016-02-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (b86071528f32 cfg80211: stop critical protocol session upon disconnect event)
Merging sound-current/for-linus (7e31a0159461 ALSA: hda - Apply clock gate workaround to Skylake, too)
Merging pci-current/for-linus (9a091fd371f8 Merge branch 'pci/host-hv' into for-linus)
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (e5bdfd50d6f7 Revert "usb: hub: do not clear BOS field during reset device")
Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
Merging usb-serial-fixes/usb-linus (d061c1caa31d USB: option: add "4G LTE usb-modem U901")
Merging usb-chipidea-fixes/ci-for-usb-stable (8c0614ca312c usb: chipidea: fix return value check in ci_hdrc_pci_probe())
Merging staging.current/staging-linus (7a64cd887fdb drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE)
Merging char-misc.current/char-misc-linus (18558cae0272 Linux 4.5-rc4)
Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
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 (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups)
Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (9b18572e83bf drm/i915/gen9: Verify and enforce dc6 state writes)
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (38a39d18e7b4 ARC: clockevent: Prepare for DT based probe)
CONFLICT (content): Merge conflict in arch/arc/kernel/intc-compact.c
CONFLICT (content): Merge conflict in arch/arc/Kconfig
Merging arm/for-next (113b44c6c25b Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (94085fe570e7 arm64: dts: Add Cavium ThunderX specific PMU)
Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
Merging at91/at91-next (799da647446d Merge tag 'at91-ab-4.6-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (655f2d0d2295 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (98a5093dc516 Merge branch 'mvebu/dt64' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging omap/for-next (601052bca473 Merge branch 'omap-for-v4.6/dt' into for-next)
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (305d0c411114 ARM: qcom: Drop ARCH_MSM* configs)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (414811089a01 Merge branches 'heads/defconfig-for-v4.6' and 'heads/dt-for-v4.6' into next)
Merging rockchip/for-next (2def4fc4fc2d Merge branch 'v4.6-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c67b0b31311f Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (5e04a6344023 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6', 'sunxi/dt-for-4.6' and 'sunxi/defconfig-for-4.6' into sunxi/for-next)
Merging tegra/for-next (822a31bceba1 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (f98deee9a9f8 arm64: move brk immediate argument definitions to separate header)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
Merging m68knommu/for-next (0cdfea013ee8 m68knommu: fix FEC platform device registration when driver is modular)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (f1cf93aed364 MIPS: tlb-r4k: panic if the MMU doesn't support PAGE_SIZE)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (56c08e6d226c powerpc: atomic: Implement acquire/release/relaxed variants for cmpxchg)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (13c6a790d77c s390/mm: correct comment about segment table entries)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging btrfs-kdave/for-next (c4067a08c106 Merge branch 'for-next-4.6-20160223' into for-next-20160223)
Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
Merging cifs/for-next (81f70ba233d5 Linux 4.5-rc5)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (6332b9b5e797 ext4: Make Q_GETNEXTQUOTA work for quota in hidden inodes)
Merging ext4/dev (d89b5f6318c2 jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling)
Merging f2fs/dev (80c4fd200a7c f2fs: avoid hungtask problem caused by losing wake_up)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (00bf5636b147 GFS2: Prevent delete work from occurring on glocks used for create)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (9fd4b9fc7695 NFSv4.x/pnfs: Fix a race between layoutget and bulk recalls)
Merging nfsd/nfsd-next (b7052cd7bcf3 sunrpc/cache: fix off-by-one in qword_get())
Merging orangefs/for-next (c1223ca48baa orangefs: get rid of op refcounts)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (e15c65b38461 Merge branch 'xfs-writepage-rework-4.6' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
CONFLICT (content): Merge conflict in drivers/pci/probe.c
Merging hid/for-next (c2781579ce25 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (4916eb690976 i2c: iproc: Support larger TX transfer)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (e1370715b20e ARM: dts: vfxxx: Add iio_hwmon node for ADC temperature channel)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (c2fd1465f329 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (4477c1cdf1c4 Merge branch 'for-4.6' into for-next)
Merging pm/linux-next (9822c3f7f0de Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
Merging thermal-soc/next (eb4fc33eb268 thermal: small style cleanup in mtk_thermal)
Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils)
Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (7a02d9b6888e Merge branch 'topic/omap' into next)
Merging net-next/master (f5461c276316 Merge branch 'dsa-pass-bridge-to-drivers')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (d289cbed9d55 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue)
Merging bluetooth/master (ebba380cc946 ieee802154: 6lowpan: fix return of netdev notifier)
Merging mac80211-next/master (c4b29719e095 rfkill: Notify userspace of airplane-mode state changes)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
$ git reset --hard HEAD^
Merging next-20160223 version of mac80211-next
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
[master 425a286a2dda] next-20160223/mac80211-next
Merging rdma/for-next (18558cae0272 Linux 4.5-rc4)
Merging mtd/master (38714fbd299f MAINTAINERS: update Han's email)
Merging l2-mtd/master (3b5394a3ccff mtd: spi-nor: remove micron_quad_enable())
Merging crypto/master (49abc0d2e19b crypto: xts - fix compile errors)
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/crypto/fname.c
$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
Merging drm/drm-next (d2eaa59000c7 Merge branch 'drm-rockchip-next-2016-02-18' of https://github.com/markyzq/kernel-drm-rockchip into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
Applying: drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (6831f3e3c640 drm/i915: Add for_each_pipe_masked())
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (a6ddd2f1b99f drm/udl: Use module_usb_driver)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (a17ba6a39ed1 drm/msm: add timestamp param)
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (fc04023fafec drm/vc4: Add support for YUV planes.)
Merging sound/for-next (fe0d128c57bf ALSA: jack: Allow building the jack layer without input device)
Merging sound-asoc/for-next (f2163caed70b Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/ssm4567', 'asoc/topic/sunxi', 'asoc/topic/topology' and 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (6ccb1d8f78bd Input: add MELFAS MIP4 Touchscreen driver)
Merging block/for-next (ab3d8b3ecf77 Merge branch 'for-4.6/core' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging device-mapper/for-next (d27eb582b2bb dm: reorder 'struct mapped_device' members to fix alignment and holes)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (af3d6866825f mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (93ac96deff4c md: Drop sending a change uevent when stopping)
Merging mfd/for-mfd-next (103d8a7bb8a2 mfd: tps65090: Set regmap config reg counts properly)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (b950762c3ba7 ARM: dts: n900: Rename isp1704 to isp1707 to match correct name)
Merging omap_dss2/for-next (f059c4b220b8 fbdev: exynos: fix IS_ERR_VALUE usage)
Merging regulator/for-next (69092c65e44e Merge remote-tracking branch 'regulator/topic/vexpress' into regulator-next)
Merging security/next (602094428090 Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (1926e54f1157 MAINTAINERS: Update mailing list for Renesas ARM64 SoC Development)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (a13b64591747 vfio/pci: Expose shadow ROM as PCI option ROM)
Merging jc_docs/docs-next (510e64fb0423 Doc: ARM: Fix a typo in clksrc-change-registers.awk)
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (6338b8a12d0a Merge branches 'dt/linus' and 'dt/next' into for-next)
Merging mailbox/mailbox-for-next (be9c09bcca03 arm64: dts: mailbox device tree node for APM X-Gene platform.)
Merging spi/for-next (87f17882fe8e Merge remote-tracking branches 'spi/topic/sh' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (a4a40d25e75d Merge branch 'x86/platform')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (95d4f352d268 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
Merging rcu/rcu/next (0dd1befbc663 rcu: Remove expedited GP funnel-lock bypass)
Merging kvm/linux-next (efef127c30c5 Merge tag 'kvm-s390-next-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (67aaab4cff18 arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp)
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (d3695aa4f452 KVM: PPC: Add support for multiple-TCE hcalls)
Merging kvms390/next (1763f8d09d52 KVM: s390: bail out early on fatal signal in dirty logging)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (23217b443b4b workqueue: Replace usage of init_name with dev_set_name())
Merging drivers-x86/for-next (2d905b3e74ad intel-hid: allocate correct amount of memory for private struct)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (10c43341ac84 Merge remote-tracking branches 'regmap/topic/doc', 'regmap/topic/irq', 'regmap/topic/stride' and 'regmap/topic/update-bits' into regmap-next)
Merging hsi/for-next (901bdbdb8cb6 HSI: omap-ssi: add clk change support)
Merging leds/for-next (94b0580b6768 leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl)
Merging usb/usb-next (a057c3259ab6 usb: dwc2: USB_DWC2 should depend on HAS_DMA)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (18558cae0272 Linux 4.5-rc4)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (c4e315884ed8 staging: lustre: Remove LASSERTS from router checker)
CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
$ git rm -f drivers/staging/dgap/dgap.c
Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
Merging char-misc/char-misc-next (35bf7692e765 mei: fix format string in debug prints)
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (468de7d80707 Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (3f84575f934a Merge branch 'misc' into for-next)
Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (683072c71ff1 Merge branch 'devel' into for-next)
Merging vhost/linux-next (b91608c87c59 vring: Use the DMA API on Xen)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (3cf42efc3479 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
Merging dma-buf/for-next (0cbb0b92689a Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (f073cd8a3e7b Merge branch 'clk-samsung' into clk-next)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (76e9d9ab63cd Makefile: add kselftest-merge)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (4c5e6154516b Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
Merging rtc/rtc-next (e1d7a40f67f7 rtc: rx8025: unsupport UIE mode)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
Merging akpm-current/current (320a8eca8148 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in arch/x86/mm/extable.c
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Applying: x86/extable: remainder of revert of "x86/extable: use generic search and sort routines"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (c87875e89a0c drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2015-02-24  3:02 Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2015-02-24  3:02 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 22661 bytes --]

Hi all,

Changes since 20150223:

The hid tree gained a conflict against Linus' tree.

The drm-misc tree gained a build failure for which I applied a merge
fix patch.

Non-merge commits (relative to Linus' tree): 1108
 718 files changed, 18557 insertions(+), 17357 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 206 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 Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (c517d838eb7d Linux 4.0-rc1)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory)
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
Merging arm-current/fixes (23be7fdafa50 ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer())
Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk)
Merging powerpc-merge-mpe/fixes (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux)
Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.)
Merging net/master (d720d8cec563 net: compat: Ignore MSG_CMSG_COMPAT in compat_sys_{send, recv}msg)
Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup())
Merging sound-current/for-linus (70372a7566b5 ALSA: pcm: Don't leave PREPARED state after draining)
Merging pci-current/for-linus (c517d838eb7d Linux 4.0-rc1)
Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed)
Merging driver-core.current/driver-core-linus (c517d838eb7d Linux 4.0-rc1)
Merging tty.current/tty-linus (c517d838eb7d Linux 4.0-rc1)
Merging usb.current/usb-linus (c517d838eb7d Linux 4.0-rc1)
Merging usb-gadget-fixes/fixes (a0456399fb07 usb: gadget: configfs: don't NUL-terminate (sub)compatible ids)
Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console)
Merging staging.current/staging-linus (c517d838eb7d Linux 4.0-rc1)
Merging char-misc.current/char-misc-linus (c517d838eb7d Linux 4.0-rc1)
Merging input-current/for-linus (4c971aa78314 Merge branch 'next' into for-linus)
Merging crypto-current/master (96692a7305c4 crypto: tcrypt - do not allocate iv on stack for aead speed tests)
Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests)
Merging rr-fixes/fixes (f47689345931 lguest: update help text.)
Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe())
Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test)
Merging drm-intel-fixes/for-linux-next-fixes (cf6f0af9fbdd drm/i915: Dell Chromebook 11 has PWM backlight)
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
Merging arc/for-next (06f34e1c28f3 ARC: fix page address calculation if PAGE_OFFSET != LINUX_LINK_BASE)
Merging arm/for-next (42203614b435 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1)
Merging arm-soc/for-next (d88d6cfc912e ARM: mm: Remove Kconfig symbol CACHE_PL310)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1)
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
Merging imx-mxs/for-next (395ae1400a35 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
Merging mvebu/for-next (444fdf947de3 ARM: mvebu: Add Device Tree description of SDHCI for Armada 388 RD)
Merging omap/for-next (5cb1e109eee0 Merge tag 'omap-for-v3.20/dt-pt3-v2' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
Merging renesas/next (b2cb094d275e Merge branch 'heads/soc-fixes-for-v3.19' into next)
Merging samsung/for-next (aeb011501873 Merge branch 'v3.20-samsung-defconfig-2' into for-next)
Merging sunxi/sunxi/for-next (50997798fb8a Merge branch 'sunxi/fixes-for-4.0' into sunxi/for-next)
Merging tegra/for-next (794345d409ad Merge branch for-3.20/arm64 into for-next)
Merging arm64/for-next/core (d476d94f180a arm64: compat: Remove incorrect comment in compat_siginfo)
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (9987c19ed9a7 CRIS: Whitespace cleanup)
Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
Merging ia64/next (a6b8978c54b7 pstore: Fix sprintf format specifier in pstore_dump())
Merging m68k/for-next (4436820a98cd m68k/defconfig: Enable Ethernet bridging)
Merging m68knommu/for-next (c517d838eb7d Linux 4.0-rc1)
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
Merging microblaze/next (a01d37d914f9 microblaze: Remove *.dtb files in make clean)
Merging mips/mips-for-linux-next (64b139f97c01 MIPS: OCTEON: irq: add CIB and other fixes)
Merging nios2/nios2-next (d16d2be111a6 nios2: add kgdb support)
Merging parisc-hd/for-next (bfa76d495765 Linux 3.19)
Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible)
Merging powerpc-mpe/next (a6130ed253a9 cxl: Add missing return statement after handling AFU errror)
Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page)
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (42d19952a90d s390/traps: panic() instead of die() on translation exception)
CONFLICT (content): Merge conflict in arch/s390/kernel/early.c
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (740e1433f50e tile: change MAINTAINERS website from tilera.com to ezchip.com)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization)
Merging btrfs/next (a742994aa2e2 Btrfs: don't remove extents and xattrs when logging new names)
Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default)
CONFLICT (content): Merge conflict in net/ceph/ceph_common.c
CONFLICT (content): Merge conflict in net/ceph/auth_x.c
CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h
CONFLICT (content): Merge conflict in fs/ceph/super.h
CONFLICT (content): Merge conflict in fs/ceph/super.c
CONFLICT (content): Merge conflict in fs/ceph/snap.c
CONFLICT (content): Merge conflict in fs/ceph/inode.c
Merging cifs/for-next (5a090583c3fc Update negotiate protocol for SMB3.1 dialect)
Merging ecryptfs/next (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
Merging ext3/for_next (6981498d7956 udf: remove bool assignment to 0/1)
Merging ext4/dev (6f30b7e37a82 ext4: fix indirect punch hole corruption)
Merging f2fs/dev (db3ecdee1cf0 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds)
Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
CONFLICT (content): Merge conflict in fs/fscache/object.c
Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT)
Merging gfs2/for-next (76514aeef65e GFS2: Allocate reservation during splice_write)
Merging jfs/jfs-next (648695c74811 jfs: Deletion of an unnecessary check before the function call "unload_nls")
Merging nfs/linux-next (c517d838eb7d Linux 4.0-rc1)
Merging nfsd/nfsd-next (a1d1e9be5a1d svcrpc: fix memory leak in gssp_accept_sec_context_upcall)
Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
Merging ubifs/linux-next (b388e6a7a6ba UBI: fix missing brace control flow)
Merging xfs/for-next (c517d838eb7d Linux 4.0-rc1)
Merging file-locks/linux-next (b2b89ebfc0f0 Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux)
Merging vfs/for-next (ca160d0085b6 kill struct filename.separate)
Merging pci/next (c517d838eb7d Linux 4.0-rc1)
Merging hid/for-next (ca2f29b3d39e Merge branch 'for-4.1/upstream' into for-next)
CONFLICT (content): Merge conflict in drivers/iio/common/hid-sensors/hid-sensor-trigger.c
Merging i2c/i2c/for-next (c517d838eb7d Linux 4.0-rc1)
Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6)
Merging hwmon-staging/hwmon-next (9248faef66cd hwmon: (ibmpex) Allow format string checking)
Merging v4l-dvb/master (48b777c0833b Merge branch 'patchwork' into to_next)
Merging kbuild/for-next (8d18d1d514d1 Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (bfa76d495765 Linux 3.19)
Merging libata/for-next (d85aa1624b05 Merge branch 'for-3.19-fixes' into for-next)
Merging pm/linux-next (c517d838eb7d Linux 4.0-rc1)
Merging idle/next (210109f4a19a Merge branches 'turbostat', 'sfi' and 'cpuidle' into release)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (4531fa1684bb thermal: exynos: fix: Check if data->tmu_read callback is present before read)
Merging thermal-soc/next (c517d838eb7d Linux 4.0-rc1)
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (771bd4f095dd Merge branch 'fixes' into next)
Merging net-next/master (5e3d31896b87 Merge branch 'be2net-next')
Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci')
Merging wireless-drivers-next/master (d53071143aa5 Merge ath-next from ath.git)
Merging bluetooth/master (03f310efd4b1 Bluetooth: Remove unnecessary queue_monitor_skb() function)
Merging infiniband/for-next (147d1da951cf Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next)
Merging mtd/master (eb928d40a93f Merge JFFS2 updates from David Woodhouse)
Merging l2-mtd/master (eb928d40a93f Merge JFFS2 updates from David Woodhouse)
Merging crypto/master (db71f29a1c32 crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed)
Merging drm/drm-next (45ee2dbc65cb Merge branch 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE)
Merging drm-intel/for-linux-next (e489e38e3f88 drm/i915: gen5+ can have FBC with multiple pipes)
Merging drm-tegra/drm/tegra/for-next (07d05cbf60ed drm/tegra: dc: Move more code into ->init())
Merging drm-misc/topic/drm-misc (9590552893e2 drm/atomic-helpers: make mode_set hooks optional)
Applying: drm/atomic-helper: fix for Rename commmit_post/pre_planes
Merging sound/for-next (72f770c6acde Merge branch 'topic/timestamp' into for-next)
Merging sound-asoc/for-next (9c208ed74c76 Merge remote-tracking branches 'asoc/fix/rsnd', 'asoc/fix/rt5670' and 'asoc/fix/samsung' into asoc-linus)
Merging modules/modules-next (9cc019b8c94f module: Replace over-engineered nested sleep)
Merging virtio/virtio-next (5b40a7daf518 virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.)
Merging input/next (290b799c390d Input: psmouse - use IS_ENABLED instead of homegrown code)
Merging block/for-next (434c26478166 Merge branch 'for-3.20/core' into for-next)
Merging device-mapper/for-next (762143713731 dm: remove unnecessary wrapper around blk_lld_busy)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (802ea9d8645d Merge tag 'dm-3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm)
Merging kgdb/kgdb-next (dd8f30cc0550 kgdb, docs: Fix <para> pdfdocs build errors)
Merging md/for-next (26ac107378c4 md/raid5: Fix livelock when array is both resyncing and degraded.)
Merging mfd/for-mfd-next (0a65fbf64dad mfd: intel_soc_pmic: Add missing error check for devm_kzalloc)
Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element)
Merging battery/master (9e23e22cd61a power: ltc2941-battery-gauge: Fix typo in conversion formula (58 instead of 85))
Merging omap_dss2/for-next (d6c2152b3efd Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next)
Merging regulator/for-next (264d8de777a4 Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/rk808' into regulator-linus)
Merging security/next (04f81f0154e4 cipso: don't use IPCB() to locate the CIPSO IP option)
Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory)
Merging selinux/next (387fb779789d selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (b08c144e3a10 watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch)
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
Merging iommu/next (a20cc76b9efa Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (6140a8f56238 vfio-pci: Add device request interface)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
Merging jc_docs/docs-next (52e68924dfa8 Documentation: Fix the wrong command `echo -1 > set_ftrace_pid` for cleaning the filter.)
Merging trivial/for-next (edb0ec0725bb kexec, Kconfig: spell "architecture" properly)
Merging audit/next (5b28255278dd audit: reduce mmap_sem hold for mm->exe_file)
Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code)
Merging dt-rh/for-next (3c3c8e3618b0 Merge remote-tracking branch 'grant/devicetree/next' into for-next)
Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings)
Merging spi/for-next (4f16c3cd0b66 Merge remote-tracking branch 'spi/fix/ti-qspi' into spi-linus)
Merging tip/auto-latest (3cf6be48c376 Merge branch 'timers/core')
Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer)
CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig
Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks)
Merging edac-amd/for-next (30263b4052c6 EDAC, mv64x60_edac: Fix an error code in probe())
Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (c19565fc83e6 Merge branch 'for-next/ftrace/core' into trace/for-next)
Merging rcu/rcu/next (b52e22f3021d Merge with c8bcfbf1b744 (rcu: Process offlining and onlining only at grace-period start))
Merging kvm/linux-next (4ff6f8e61eb7 KVM: emulate: fix CMPXCHG8B on 32-bit hosts)
Merging kvm-arm/next (4b990589952f KVM: Remove unused config symbol)
Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD)
Merging kvms390/next (de8e5d744051 KVM: Disable compat ioctl for s390)
Merging xen-tip/linux-next (a2e75bc2ee20 xenbus: Add proper handling of XS_ERROR from Xenbus for transactions.)
Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying())
Merging workqueues/for-next (b5b3ab523e31 Merge branch 'for-3.19-fixes' into for-next)
Merging drivers-x86/for-next (c57c0fa4bc9c toshiba_acpi: Cleanup GPL header)
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
Merging regmap/for-next (48bbdbb173fa Merge remote-tracking branch 'regmap/fix/irq' into regmap-linus)
Merging hsi/for-next (f034125dfdae HSI: nokia-modem: fix error return code)
Merging leds/for-next (ffe2428614d2 leds: flash: remove stray include directive)
Merging ipmi/for-next (3a31f945b709 ipmi: Remove incorrect use of seq_has_overflowed)
Merging driver-core/driver-core-next (c517d838eb7d Linux 4.0-rc1)
Merging tty/tty-next (c517d838eb7d Linux 4.0-rc1)
Merging usb/usb-next (c517d838eb7d Linux 4.0-rc1)
Merging usb-gadget/next (c517d838eb7d Linux 4.0-rc1)
Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code)
Merging staging/staging-next (c517d838eb7d Linux 4.0-rc1)
Merging char-misc/char-misc-next (c517d838eb7d Linux 4.0-rc1)
Merging cgroup/for-next (8abba61bcfd4 Merge branch 'for-3.19-fixes' into for-next)
Merging scsi/for-next (cad8000836ef Merge branch 'misc' into for-next)
Merging target-updates/for-next (aa04dae454d0 target: Set LBPWS10 bit in Logical Block Provisioning EVPD)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging pinctrl/for-next (c517d838eb7d Linux 4.0-rc1)
Merging vhost/linux-next (4fe00489e61c vhost: drop hard-coded num_buffers size)
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (2f97c20e5f7c gpio: tps65912: fix wrong container_of arguments)
Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
Merging pwm/for-next (b65af27ad89d pwm: tegra: Use NSEC_PER_SEC)
Merging dma-buf/for-next (817bd7253291 dma-buf: cleanup dma_buf_export() to make it easily extensible)
Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests)
Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable)
Merging clk/clk-next (ec02ace8ca0a clk: Only recalculate the rate if needed)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (6ddf898c23d6 selftests/exec: Check if the syscall exists and bail if not)
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
Merging luto-misc/next (82bbadb13ef4 x86, entry: Remove int_check_syscall_exit_work)
Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE)
Merging livepatching/for-next (0937e3b025f7 livepatch: simplify disable error path)
Merging akpm-current/current (d07b956c650a scripts/gdb: Add infrastructure)
CONFLICT (content): Merge conflict in scripts/module-common.lds
CONFLICT (add/add): Merge conflict in scripts/Makefile.kasan
CONFLICT (content): Merge conflict in mm/vmscan.c
CONFLICT (content): Merge conflict in mm/swap.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in mm/slab_common.c
CONFLICT (modify/delete): mm/filemap_xip.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of mm/filemap_xip.c left in tree.
CONFLICT (content): Merge conflict in lib/Makefile
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in init/Kconfig
CONFLICT (content): Merge conflict in include/linux/mm.h
CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify.c
CONFLICT (content): Merge conflict in drivers/rtc/Makefile
CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/kernel/time.c
CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable-bits.h
CONFLICT (add/add): Merge conflict in Documentation/kasan.txt
$ git rm -f mm/filemap_xip.c
Applying: fix bad merge in akpm-current
Applying: fix another bad merge in akpm-current
$ git checkout -b akpm remotes/origin/akpm/master
Applying: ocfs2: use 64bit variables to track heartbeat time
Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (2e34ea6cab7b mm: add strictlimit knob)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2014-02-24  6:37 Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2014-02-24  6:37 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 23811 bytes --]

Hi all,

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

Changes since 20140221:

The mvebu tree gained a conflict against Linus' tree.

The powerpc tree still had its build failure.

The mfd-lj tree still had its build failure so I used the version from
next-20140210.

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

The spi tree gained a build failure so I sued the version from
next-20140221.

The rcu tree gained a conflict against the tip tree.

The char-misc tree still had its build failure for which I applied a
merge fix patch.

Non-merge commits (relative to Linus' tree): 4150
 4214 files changed, 152464 insertions(+), 78715 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 (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.

I am currently merging 210 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                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (f9b080803ec6 Merge tag 'usb-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
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 (7e22e91102c6 Linux 3.13-rc8)
Merging arm-current/fixes (b36345759308 ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU)
Merging m68k-current/for-linus (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr)
Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
Merging powerpc-merge/merge (66f9af83e56b powerpc/eeh: Disable EEH on reboot)
Merging sparc/master (10527106abec Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux)
Merging net/master (916e4cf46d02 ipv6: reuse ip6_frag_id from ip6_ufo_append_data)
Merging ipsec/master (ee5c23176fcc xfrm: Clone states properly on migration)
Merging sound-current/for-linus (c60666bd2224 ALSA: hda/realtek - Add more entry for enable HP mute led)
Merging pci-current/for-linus (fc40363b2140 ahci: Fix broken fallback to single MSI mode)
Merging wireless/master (b3050248c167 ath9k: Fix ETSI compliance for AR9462 2.0)
Merging driver-core.current/driver-core-linus (6d0abeca3242 Linux 3.14-rc3)
Merging tty.current/tty-linus (5c0a2450d695 Revert "tty: Set correct tty name in 'active' sysfs attribute")
Merging usb.current/usb-linus (5bf5dbeda245 usb: chipidea: need to mask when writting endptflush and endptprime)
Merging staging.current/staging-linus (e194fd8a5d8e staging: binder: Fix death notifications)
Merging char-misc.current/char-misc-linus (accb884b32e8 mei: set client's read_cb to NULL when flow control fails)
Merging input-current/for-linus (70b0052425ff Input: da9052_onkey - use correct register bit for key status)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue)
Merging ide/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze)
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 vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (f51a44b9a6c4 drm/i915/dp: add native aux defer retry limit)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (67a2635aa64a ARC: [clockevent] simplify timer ISR)
Merging arm/for-next (a94e70d5d97b Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next)
Merging arm-perf/for-next/perf (8e781f65423c ARM: perf: add support for the Cortex-A12 PMU)
Merging arm-soc/for-next (48bbbf563b12 Merge branches 'next/cleanup', 'next/soc', 'next/dt', 'next/boards', 'next/drivers' and 'fixes' into for-next)
Merging bcm2835/for-next (724619af236c Merge branch 'for-3.15/dt' into for-next)
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (8cfdab14395c Merge branch 'imx/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/common.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (52eaa3d1e97f Merge branch 'for_3.15/dts' into next)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (36d822b7aa17 Merge branch 'mvebu/dt-3xx' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging renesas/next (2691b9531be2 Merge branches 'heads/defconfig-for-v3.15', 'heads/intc-for-v3.15', 'heads/soc-for-v3.15', 'heads/boards-for-v3.15' and 'heads/dt-for-v3.15' into next)
Merging samsung/for-next (403ead113c0c Merge branch 'v3.15-next/dt-samsung' into for-next)
Merging tegra/for-next (1ea2965c2ddd Merge branch for-3.15/defconfig into for-next)
Merging arm64/for-next/core (38dbfb59d117 Linus 3.14-rc1)
Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@samsung.com>)
Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h)
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
Merging hexagon/linux-next (44eb66c228fe Hexagon: update CR year for elf.h)
Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64)
Merging m68k/for-next (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr)
Merging m68knommu/for-next (72a8ab3cb2a5 m68knommu: fix arg types for outs* functions)
Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static)
Merging microblaze/next (7e4d16e416fe microblaze: Drop architecture-specific declaration of early_printk)
Merging mips/mips-for-linux-next (7d3f1a59e7e5 Merge branch '3.14-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (38dbfb59d117 Linus 3.14-rc1)
Merging powerpc/next (f878f84373ae powerpc: Wire up sched_setattr and sched_getattr syscalls)
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (322986ca64d1 s390: add some drivers/subsystems to the MAINTAINERS file)
Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging tile/master (5e01dc7b26d9 Linux 3.12)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (c0e50d41126e xtensa: fix fast_syscall_spill_registers)
Merging btrfs/next (cf93da7bcf45 Btrfs: fix spin_unlock in check_ref_cleanup)
Merging ceph/master (bee26897097f libceph: a per-osdc crush scratch buffer)
Merging cifs/for-next (436cc412874c cifs: sanity check length of data to send before sending)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS)
Merging ext3/for_next (0dc83bd30b0b Revert "writeback: do not sync data dirtied after sync start")
Merging ext4/dev (442ed22745a0 ext4: merge uninitialized extents)
Merging f2fs/dev (8288b113d490 f2fs: fix to do build_stat prior to the recovery procedure)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
Merging fuse/for-next (b2ec2778df9d fuse: Turn writeback cache on)
Merging gfs2/master (ad781971d9b8 GFS2: add missing newline)
Merging jfs/jfs-next (844fa1b5f849 jfs: set i_ctime when setting ACL)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (146d70caaa1b NFS fix error return in nfs4_select_rw_stateid)
Merging nfsd/nfsd-next (1406b916f4a2 nfsd: fix lost nfserrno() call in nfsd_setattr())
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
Merging v9fs/for-next (38dbfb59d117 Linus 3.14-rc1)
Merging ubifs/linux-next (5547fec74a56 UBI: fix some use after free bugs)
Merging xfs/for-next (027f185e66eb Merge remote-tracking branch 'xfs-async-aio-extend' into for-next)
Merging file-private-locks/linux-next (1ed1950c412f locks: add new fcntl cmd values for handling file private locks)
Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging pci/next (86afe959b08e Merge branches 'pci/host-designware', 'pci/host-imx6' and 'pci/host-rcar' into next)
CONFLICT (content): Merge conflict in drivers/ata/ahci.c
Merging hid/for-next (873400fa32c2 Merge branch 'for-3.15/sony' into for-next)
CONFLICT (content): Merge conflict in drivers/hid/i2c-hid/i2c-hid.c
CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
Merging i2c/i2c/for-next (6d0abeca3242 Linux 3.14-rc3)
Merging jdelvare-hwmon/master (c1d70b646dae hwmon: (lm90) Convert to use hwmon_device_register_with_groups)
Merging hwmon-staging/hwmon-next (10056e55982a hwmon: (max6639) Convert to use devm_hwmon_device_register_with_groups)
Merging v4l-dvb/master (b215621049bd Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (ff6b9bdb6263 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (1bda101edbd0 Merge branch 'for-3.15' into for-next)
Merging pm/linux-next (8029cfa9b10b Merge branch 'acpi-dsm')
Merging idle/next (62eec04c7fa3 Merge branch 'turbostat' into release)
Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (6d0abeca3242 Linux 3.14-rc3)
Merging ieee1394/for-next (fcd46b34425d firewire: Enable remote DMA above 4 GB)
Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages)
Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
Merging slave-dma/next (3c79200df630 Merge branch 'fixes' into next)
Merging dmaengine/next (77873803363c net_dma: mark broken)
Merging net-next/master (3b5c8ab11553 Merge branch 'i40evf')
CONFLICT (content): Merge conflict in net/ipv6/sit.c
CONFLICT (content): Merge conflict in drivers/net/wireless/mwifiex/pcie.c
Merging ipsec-next/master (cc9ab60e5796 xfrm: Cleanup error handling of xfrm_state_clone)
Merging wireless-next/master (35582ad9d342 Staging: rtl8812ae: remove modules field of rate_control_ops)
Merging bluetooth/master (7bf32048b1af Bluetooth: Remove unneeded hdev->own_addr_type)
Merging infiniband/for-next (7f3c1e1ba82e Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'usnic' into for-next)
Merging mtd/master (bb38eefb6858 mtd: nand: omap: fix ecclayout->oobfree->length)
Merging l2-mtd/master (6ce719b36b85 mtd: ts5500: Add dependency)
Merging crypto/master (883619a931e9 crypto: caam - fix ERA retrieval function)
Merging drm/drm-next (ef64cf9d0604 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
Merging drm-intel/for-linux-next (4c0e55288211 drm/i915: fix NULL deref in the load detect code)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
Merging drm-tegra/drm/for-next (a608d94a0b50 gpu: host1x: export host1x_syncpt_incr_max() function)
Merging sound/for-next (20c8cd593abb ALSA: rawmidi: remove undefined functions.)
Merging sound-asoc/for-next (2346e52deadf Merge remote-tracking branches 'asoc/topic/wm8993', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm8996', 'asoc/topic/wm9081' and 'asoc/topic/wm9705' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/kirkwood/Kconfig
Merging modules/modules-next (917307b09ad5 module: remove MODULE_GENERIC_TABLE)
Merging virtio/virtio-next (6f0317058f43 tools/virtio: add a missing ))
Merging input/next (7fb45edba8b5 Input: imx_keypad - Propagate the real error code on platform_get_irq() failure)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (943130f70b77 Merge branch 'for-3.15/drivers' into for-next)
Merging device-mapper/for-next (f4ef95631ebf dm thin: do not run the worker thread if pool is suspended)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (8d94b54d99ea mmc: mmci: Enable support for busy detection for ux500 variant)
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (789b5e031528 md/raid5: Fix CPU hotplug callback registration)
Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
Merging mfd-lj/for-mfd-next (90f473a72867 mfd: timberdale: Use pci_enable_msix_range() instead of pci_enable_msix())
$ git reset --hard HEAD^
Merging next-20140210 version of mfd-lj
Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (c4a41bcc1726 video: xilinxfb: Move xilinxfb_platform_data directly to the driver)
Merging regulator/for-next (d95dbd748fa8 Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6524x', 'regulator/topic/tps6586x', 'regulator/topic/tps65910', 'regulator/topic/tps80031', 'regulator/topic/wm831x', 'regulator/topic/wm8350' and 'regulator/topic/wm8994' into regulator-next)
Merging security/next (e0c2de2b15da security: cleanup Makefiles to use standard syntax for specifying sub-directories)
Merging selinux/next (81c94e76ce8e selinux: fix the output of ./scripts/get_maintainer.pl for SELinux)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (10527106abec Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux)
Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
Merging iommu/next (972157cac528 arm/smmu: Use irqsafe spinlock for domain lock)
Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER interrupt setup)
Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (80dd6eac0090 net-sysfs: fix comment typo 'CONFIG_SYFS')
Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-parameters.txt)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (f4d4ffc03efc kbuild: dtbs_install: new make target)
CONFLICT (content): Merge conflict in drivers/of/of_net.c
Applying: net: of: merges fix for a moved comment
Merging dt-rh/for-next (06b29e76a74b of: search the best compatible match first in __of_match_node())
Merging spi/for-next (f4fb93a951db Merge remote-tracking branches 'spi/topic/txx9', 'spi/topic/xfer' and 'spi/topic/xilinx' into spi-next)
$ git reset --hard HEAD^
Merging next-20140221 version of spi
Merging tip/auto-latest (2d286bdbc88c Merge branch 'x86/x32')
Merging clockevents/clockevents/next (00e2bcd6d35f clocksource: Timer-sun5i: Switch to sched_clock_register())
Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put)
Merging edac-amd/for-next (bdac9abab6fe MCE, AMD: Fix decoding module loading on unsupported hw)
Merging ftrace/for-next (1fcc155351f1 ftrace: Have static function trace clear ENABLED flag on unregister)
Merging rcu/rcu/next (e9d86a3c1385 Merge branch 'torture.2014.02.23a' into HEAD)
CONFLICT (content): Merge conflict in kernel/rcu/rcutorture.c
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
Merging kvm-ppc/kvm-ppc-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (b1f5d76c5d9b Merge branch 'devel/for-linus-3.15' into linux-next)
Merging percpu/for-next (d5f2deed588b Merge branch 'for-3.14' into for-next)
Merging workqueues/for-next (379e899a2c66 Merge branch 'for-3.15' into for-next)
Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id macros)
Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (e73c4113b0bf Merge remote-tracking branches 'regmap/topic/irq', 'regmap/topic/nodev' and 'regmap/topic/patch' into regmap-next)
Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (59e35a9e5315 drivers/leds: delete non-required instances of include <linux/init.h>)
Merging driver-core/driver-core-next (6d8b3e1ad3d3 kernfs: remove duplicate dir.c at the top dir)
Merging tty/tty-next (12f287878afc serial: fsl_lpuart: documented the clock requirement.)
Merging usb/usb-next (f6723b569a67 usb: host: remove selects of USB_ARCH_HAS_?HCI)
Merging usb-gadget/next (40f099e32c2a usb: musb: dsps, debugfs files)
Merging staging/staging-next (aa256f8d0dd9 Merge tag 'iio-for-3.15b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
Merging char-misc/char-misc-next (0a191749ce19 Merge branch 'char-misc-linus' into char-misc-next)
Applying: mei: txe: include irqreturn.h for irqreturn_t etc
Merging cgroup/for-next (3c0d1ccae0e5 Merge branch 'for-3.14-fixes' into for-next)
Merging scsi/for-next (960dfc4eb23a Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux)
Merging target-updates/for-next (9af6de4a22c5 target: silence GCC warning in target_alua_state_check)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (97e00faaf16a pinctrl: sh-pfc: r8a7790: Break out USB0 OVC/VBUS)
Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (a3485d088516 gpio: consumer.h: Move forward declarations outside #ifdef)
Merging dma-mapping/dma-mapping-next (c091c71ad221 x86: dma-mapping: fix GFP_ATOMIC macro usage)
Merging pwm/for-next (6691a19966f0 pwm: tiecap: Remove duplicate put_sync call)
Merging dma-buf/for-next (c0b00a525c12 dma-buf: update debugfs output)
Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_getgid)
Merging ktest/for-next (961d9caceea2 ktest: Add BISECT_TRIES to bisect test)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (c112c1d8ef29 clk: ux500: Staticize ux500_twocell_get)
Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf())
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
Merging aio/master (4675348e78fa Merge tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip)
Merging llvmlinux/for-next (f557840d8992 x86, acpi: LLVMLinux: Remove nested functions from Thinkpad ACPI)
Merging akpm-current/current (79db0b2d0308 ipc: use device_initcall)
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in drivers/sbus/char/jsflash.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: arm: move arm_dma_limit to setup_dma_zone
Applying: mm: add strictlimit knob
Merging akpm/master (96481bbec6f4 mm: add strictlimit knob)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2013-02-26  5:00 ` Sedat Dilek
@ 2013-02-26  5:30   ` Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2013-02-26  5:30 UTC (permalink / raw)
  To: sedat.dilek; +Cc: linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

Hi,

On Tue, 26 Feb 2013 06:00:24 +0100 Sedat Dilek <sedat.dilek@gmail.com> wrote:
>
> February 26th...

Yeah  :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2013-02-26  3:16 Stephen Rothwell
@ 2013-02-26  5:00 ` Sedat Dilek
  2013-02-26  5:30   ` Stephen Rothwell
  0 siblings, 1 reply; 30+ messages in thread
From: Sedat Dilek @ 2013-02-26  5:00 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

February 26th...

- Sedat -

On Tue, Feb 26, 2013 at 4:16 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Please do not add any work destined for v3.10 to your -next included
> branches until after Linus has release v3.9-rc1.
>
> Changes since 20130223:
>
> The kbuild tree lost its build failure.
>
> The infiniband tree gained a conflict against Linus' tree.
>
> The drm tree still has its build failure for which I applied a patch.
>
> ----------------------------------------------------------------------------
>
> 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 216 trees (counting Linus' and 28 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 Rothwell                    sfr@canb.auug.org.au
>
> $ git checkout master
> $ git reset --hard stable
> Merging origin/master (ab78265 Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6)
> Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
> Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
> Merging arm-current/fixes (b255188 ARM: fix scheduling while atomic warning in alignment handling code)
> Merging m68k-current/for-linus (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
> Merging powerpc-merge/merge (eda8eeb powerpc/mm: Fix hash computation function)
> Merging sparc/master (f9fd348 sparc32: refactor smp boot)
> Merging net/master (eb970ff usbnet: smsc95xx: rename FEATURE_AUTOSUSPEND)
> Merging ipsec/master (85dfb74 af_key: initialize satype in key_notify_policy_flush())
> Merging sound-current/for-linus (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU)
> Merging pci-current/for-linus (249bfb8 PCI/PM: Clean up PME state when removing a device)
> Merging wireless/master (dc4a787 brcmfmac: fix missing unlock on error in brcmf_notify_vif_event())
> Merging driver-core.current/driver-core-linus (949db15 Linux 3.8-rc5)
> Merging tty.current/tty-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
> Merging usb.current/usb-linus (74e1a2a Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
> Merging staging.current/staging-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
> Merging char-misc.current/char-misc-linus (7ed214a Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
> Merging input-current/for-linus (171fb58 Input: ALPS - update documentation for recent touchpad driver mods)
> Merging md-current/for-linus (c43a660 md/raid1,raid10: fix deadlock with freeze_array())
> Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
> Merging crypto-current/master (8fd61d3 crypto: user - ensure user supplied strings are nul-terminated)
> CONFLICT (content): Merge conflict in drivers/crypto/omap-sham.c
> CONFLICT (content): Merge conflict in crypto/ctr.c
> CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/crypto/fsl-sec4.txt
> Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
> Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option)
> CONFLICT (content): Merge conflict in arch/x86/Kconfig
> CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
> Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
> Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
> Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
> Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().)
> Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG)
> Merging rr-fixes/fixes (aded024 virtio_console: Don't access uninitialized data.)
> Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
> Merging arc/for-next (fc32781 ARC: [plat-arcfpga] DT arc-uart bindings change: "baud" => "current-speed")
> CONFLICT (content): Merge conflict in init/Kconfig
> Merging arm/for-next (b47ce09 Merge branches 'devel-stable', 'fixes' and 'mmci' into for-next)
> Merging arm-perf/for-next/perf (5ef1240 Merge branches 'for-rmk/hw-breakpoint' and 'for-rmk/perf' into for-next/perf)
> Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
> Merging xilinx/arm-next (42ead3a arm: zynq: timer: Set clock_event cpumask)
> CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c
> Merging arm64/upstream (ec45d1c arm64: mm: update CONTEXTIDR register to contain PID of current process)
> Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment)
> Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h)
> Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/)
> Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
> Merging ia64/next (c9500a7 Merge branch 'pstore' into next)
> Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
> Merging m68knommu/for-next (8a67f21 m68knommu: fix trap on execing /bin/init)
> Merging metag/for-next (068bf1c metag: prom.h: remove declaration of metag_dt_memblock_reserve())
> CONFLICT (content): Merge conflict in tools/perf/perf.h
> CONFLICT (content): Merge conflict in mm/page_alloc.c
> CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
> CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
> CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
> Merging microblaze/next (711e5b4 asm-generic: io: Fix ioread16/32be and iowrite16/32be)
> Merging mips/mips-for-linux-next (19aa5ac Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next)
> CONFLICT (content): Merge conflict in arch/mips/kernel/syscall.c
> CONFLICT (content): Merge conflict in arch/mips/kernel/signal_n32.c
> CONFLICT (content): Merge conflict in arch/mips/kernel/signal32.c
> CONFLICT (content): Merge conflict in arch/mips/kernel/signal.c
> CONFLICT (content): Merge conflict in arch/mips/kernel/scall64-o32.S
> CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
> CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c
> CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/cvmx-helper-util.h
> CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-util.c
> Merging openrisc/for-upstream (ae6fef17 openrisc: really pass correct arg to schedule_tail)
> Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
> Merging powerpc/next (8520e44 powerpc/kexec: Disable hard IRQ before kexec)
> Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
> Merging mpc5xxx/next (fa59f17 powerpc/5200: Use the gpt* labels to simplify mpc5200 dts files)
> Merging galak/next (12c7e8f powerpc/85xx: l2sram - Add compatible string for BSC9131 platform)
> Merging s390/features (7f46a97 s390/uaccess: fix kernel ds access for page table walk)
> Merging sh/sh-latest (035688d sh: ecovec: add sample amixer settings)
> Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc)
> Merging tile/master (ecc46c5 tile: support atomic64_dec_if_positive())
> Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
> Merging xtensa/for_next (c50842d xtensa: add support for TLS)
> Merging btrfs/next (dc81cdc Btrfs: fix remount vs autodefrag)
> Merging ceph/master (3ebc21f libceph: fix messenger CONFIG_BLOCK dependencies)
> Merging cifs/for-next (68851c4 cifs: set MAY_SIGN when sec=krb5)
> Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
> Merging ecryptfs/next (1101d58 ecryptfs: ecryptfs_msg_ctx_alloc_to_free(): remove kfree() redundant null check)
> Merging ext3/for_next (712ddc5 Ext2: remove the static function release_blocks to optimize the kernel)
> Merging ext4/dev (304e220 ext4: fix free clusters calculation in bigalloc filesystem)
> Merging f2fs/dev (7dd690c f2fs: avoid build warning)
> Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use)
> Merging gfs2/master (fd95e81 GFS2: Reinstate withdraw ack system)
> Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits)
> Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
> Merging nfs/linux-next (78f3327 pnfs: fix resend_to_mds for directio)
> Merging nfsd/nfsd-next (56edc86 nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum)
> Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
> Merging omfs/for-next (976d167 Linux 3.1-rc9)
> Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
> Merging v9fs/for-next (b6f4bee fs/9p: Fix atomic_open)
> Merging ubifs/linux-next (8afd500 UBIFS: fix double free of ubifs_orphan objects)
> Merging xfs/for-next (1e82379 xfs: xfs_bmap_add_attrfork_local is too generic)
> Merging vfs/for-next (d526cc4 vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op)
> Merging pci/next (018ba0a Merge branch 'pci/yinghai-root-bus-hotplug' into next)
> CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c
> CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c
> CONFLICT (content): Merge conflict in drivers/acpi/scan.c
> CONFLICT (content): Merge conflict in drivers/acpi/internal.h
> CONFLICT (content): Merge conflict in arch/ia64/pci/pci.c
> Merging hid/for-next (e3dc8bf Merge branch 'for-3.9/logitech' into for-next)
> Merging i2c/i2c/for-next (55827f4 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls)
> CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-s3c2410.c
> Merging jdelvare-hwmon/master (54e37b8 Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio)
> Merging hwmon-staging/hwmon-next (55529fa Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
> Merging v4l-dvb/master (eccaaad Merge /home/v4l/v4l/patchwork)
> Merging kbuild/for-next (26901f2 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
> CONFLICT (modify/delete): kernel/timeconst.pl deleted in kbuild/for-next and modified in HEAD. Version HEAD of kernel/timeconst.pl left in tree.
> $ git rm -f kernel/timeconst.pl
> Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
> Merging libata/NEXT (53637e0 [libata] fix smatch warning for zpodd_wake_dev)
> Merging infiniband/for-next (b45a49c Merge branch 'ipoib' into for-next)
> CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/mlx4.h
> CONFLICT (content): Merge conflict in drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
> Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change)
> Merging pm/linux-next (4383822 Merge branch 'acpi-pm' into fixes)
> Merging idle/next (ca62cf5 Merge branch 'misc' into release)
> Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
> Merging cpuidle/cpuidle-next (d1c3ed6 Linux 3.8-rc2)
> Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
> Merging thermal/next (ef3ac3a Revert "Thermal: exynos: Add sysfs node supporting exynos's emulation mode.")
> Applying: sched/rt: fix PowerClamp Driver for define move
> Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast())
> Merging ubi/linux-next (19f949f Linux 3.8)
> Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists)
> Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
> Merging scsi/for-next (319cc77 Merge branch 'misc' into for-next)
> Merging target-updates/for-next (972b29c target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors)
> Merging target-merge/for-next-merge (d1c3ed6 Linux 3.8-rc2)
> Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
> Merging isci/all (6734092 isci: add a couple __iomem annotations)
> Merging slave-dma/next (17166a3 Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT")
> CONFLICT (content): Merge conflict in drivers/dma/tegra20-apb-dma.c
> CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
> CONFLICT (content): Merge conflict in drivers/dma/dw_dmac.c
> CONFLICT (content): Merge conflict in arch/arm/mach-spear6xx/spear6xx.c
> CONFLICT (content): Merge conflict in arch/arm/mach-spear3xx/spear3xx.c
> CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dma.c
> Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock)
> CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
> Merging net-next/master (a0b1c42 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
> Merging ipsec-next/master (a0b1c42 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
> Merging wireless-next/master (b53cf45 net: wireless: hostap: hostap_ap.c: Return -ENOMEM instead of -1 for if kmalloc() fails.)
> Merging bluetooth/master (a884a82 Bluetooth: Rename hci_acl_disconn)
> Merging mtd/master (0ce82b7 mtd: nand: onfi don't WARN if we are in 16 bits mode)
> Merging l2-mtd/master (24dea0c mtd: map: BUG() in non handled cases)
> Merging crypto/master (7eb9c5d crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.)
> Merging drm/drm-next (28ee461 Merge branch 'drm/hdmi-for-3.9' of git://anongit.freedesktop.org/tegra/linux into drm-next)
> CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen_cs.c
> Applying: drm/tilcdc: only build on arm
> Merging drm-intel/drm-intel-next-queued (90a72f8 drm/i915: Refactor gen2 to gen4 vblank interrupt handling)
> Merging sound/for-next (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU)
> Merging sound-asoc/for-next (5475931 Merge remote-tracking branch 'asoc/topic/da7213' into asoc-next)
> Merging modules/modules-next (d9d8d7e MODSIGN: Add option to not sign modules during modules_install)
> Merging pekey/devel-pekey (4ea349d MODSIGN: Fix including certificate twice when the signing_key.x509 already exists)
> Merging virtio/virtio-next (8078db7 virtio_console: Initialize guest_connected=true for rproc_serial)
> Merging input/next (005a69d Input: cyttsp-spi - remove duplicate MODULE_ALIAS())
> Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
> Merging cgroup/for-next (5d30b00 Merge branch 'for-3.9' into for-next)
> Merging block/for-next (833dd2e Merge branch 'for-3.9/drivers' into for-next)
> Merging device-mapper/master (6b3df99 Add a persistent bitset as a wrapper around dm-array.)
> Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
> Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
> Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
> Merging mmc/mmc-next (0e78610 mmc: tegra: assume CONFIG_OF, remove platform data)
> Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
> Merging slab/for-next (b1e0541 mm/sl[au]b: correct allocation type check in kmalloc_slab())
> Merging uclinux/for-next (b69f085 Linux 3.7-rc8)
> Merging md/for-next (eaa0945 raid5: create multiple threads to handle stripes)
> Merging mfd/for-next (ff7109f mfd: lpc_ich: Use devres API to allocate private data)
> Merging battery/master (845e37e Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux)
> CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500-bm.h
> Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
> Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
> Merging omap_dss2/for-next (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus)
> Merging regulator/for-next (2730fd8 Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next)
> Merging security/next (5b26603 tpm/ibmvtpm: build only when IBM pseries is configured)
> Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
> Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
> Merging watchdog/master (144ff55 watchdog: davinci_wdt: update to devm_* API)
> CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
> CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
> CONFLICT (content): Merge conflict in drivers/rtc/rtc-stmp3xxx.c
> Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
> Merging iommu/next (604542b Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next)
> CONFLICT (content): Merge conflict in drivers/iommu/tegra-smmu.c
> CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c
> CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
> CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-exynos5-dt.c
> Merging vfio/next (d65530f drivers/vfio: remove depends on CONFIG_EXPERIMENTAL)
> Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
> Merging jc_docs/docs-next (5c050fb docs: update the development process document)
> Merging trivial/for-next (df63447 DocBook: update EXPORT_SYMBOL entry to point at export.h)
> Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
> Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
> Merging edac/linux_next (8ae8f50 ghes_edac: Fix RAS tracing)
> Merging edac-amd/for-next (e7d2c21 mpc85xx_edac: Fix typo)
> Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add")
> Merging dt-rh/for-next (1421954 documentation/devicetree: Fix a typo in exynos-dw-mshc.txt)
> Merging spi/spi/next (095c375 spi: Document cs_gpios and cs_gpio in kernel-doc)
> Merging spi-mb/spi-next (a349685 spi/pxa2xx: add support for Lynxpoint SPI controllers)
> Merging tip/auto-latest (641e71a Merge branch 'x86/urgent')
> CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h
> Merging ftrace/for-next (8c189ea ftrace: Call ftrace cleanup module notifier after all other notifiers)
> Merging rcu/rcu/next (7a6b55e srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock())
> Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
> Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
> Merging kvm/linux-next (bd31a7f KVM: nVMX: Trap unconditionally if msr bitmap access fails)
> Merging kvm-ppc/kvm-ppc-next (899f7b2 Merge commit 'origin/next' into kvm-ppc-next)
> Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
> Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
> Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
> Merging xen-two/linux-next (39ada15 Merge branch 'stable/for-linus-3.9-take-two' into linux-next)
> Applying: xen: fix bad merge of arch/x86/xen/mmu.c
> Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
> Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument)
> Merging workqueues/for-next (a4791ca Merge branch 'for-3.9' into for-next)
> Merging drivers-x86/linux-next (8732068 ideapad: depends on backlight subsystem and update comment)
> Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
> Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
> Merging regmap/for-next (a2b37ef Merge remote-tracking branch 'regmap/topic/no-bus' into regmap-next)
> Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
> Merging leds/for-next (4b07c5d leds: leds-sunfire: use dev_err()/pr_err() instead of printk())
> Merging driver-core/driver-core-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
> Merging tty/tty-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
> Merging usb/usb-next (74e1a2a Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
> Merging staging/staging-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
> Merging char-misc/char-misc-next (7ed214a Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
> Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
> Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
> CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c
> Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
> Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
> Merging pinctrl/for-next (ade158e pinctrl: tegra: add clfvs function to Tegra114 support)
> Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency)
> Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
> Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
> Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq)
> Merging gpio/gpio/next (9170100 arm64: select ARCH_WANT_OPTIONAL_GPIOLIB)
> Merging gpio-lw/for-next (c7886b1 gpio: em: Use irq_domain_add_simple() to fix runtime error)
> Merging arm-soc/for-next (1ead4fb Merge branch 'late/mvebu-dt' into for-next)
> CONFLICT (content): Merge conflict in include/linux/mmc/host.h
> CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c
> CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-pxav3.c
> CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-esdhc-imx.c
> CONFLICT (add/add): Merge conflict in drivers/mmc/host/sdhci-bcm2835.c
> CONFLICT (content): Merge conflict in drivers/mmc/core/sdio.c
> CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
> CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
> CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
> CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-370-xp.dtsi
> Merging bcm2835/for-next (836dc9e Linux 3.8-rc7)
> Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n)
> CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h
> Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
> Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
> Merging msm/for-next (a0d271c Linux 3.6)
> Merging renesas/next (69cde01 Merge branches 'heads/defconfig', 'heads/boards3', 'boards-kzm9g-reference', 'heads/pfc' and 'heads/clocksource' into next)
> Merging samsung/for-next (786b270 Merge branch 'next/cpufreq-exynos' into for-next)
> Merging tegra/for-next (b76340f Merge branch 'for-3.9/soc-ccf-fixes' into for-next)
> Merging dma-mapping/dma-mapping-next (d589829 ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation)
> Merging pwm/for-next (30f7861 pwm: twl: Use to_twl() instead of container_of())
> Merging dma-buf/for-next (6764143 CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap)
> Merging userns/for-next (139321c cifs: Enable building with user namespaces enabled.)
> CONFLICT (content): Merge conflict in net/sunrpc/svcauth_unix.c
> Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check)
> Merging signal/for-next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal)
> Merging clk/clk-next (fde8bc5 clk: sunxi: remove stale Makefile entry)
> Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool)
> Merging lzo-update/lzo-update (0ec7382 crypto: testmgr - update LZO compression test vectors)
> Merging modem_shm/remoteproc-next (c68dc8d remoteproc: Always perserve resource table data)
> Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
> Merging akpm-current/current (6df6a56 device_cgroup: don't grab mutex in rcu callback)
> $ git checkout -b akpm remotes/origin/akpm/master
> Applying: proc: avoid extra pde_put() in proc_fill_super()
> Applying: x86 numa: don't check if node is NUMA_NO_NODE
> Applying: Revert "x86, mm: Make spurious_fault check explicitly check the PRESENT bit"
> Applying: pageattr: prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
> Applying: x86: make 'mem=' option to work for efi platform
> Applying: mm: remove free_area_cache use in powerpc architecture
> Applying: mm: use vm_unmapped_area() on powerpc architecture
> Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
> Applying: cyber2000fb: avoid palette corruption at higher clocks
> Applying: timer_list: split timer_list_show_tickdevices()
> Applying: timer_list: convert timer list to be a proper seq_file
> Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix
> Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2
> Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2-fix
> Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
> Applying: mm: use vm_unmapped_area() on ia64 architecture
> Applying: mm: use vm_unmapped_area() in hugetlbfs on ia64 architecture
> Applying: mm: use vm_unmapped_area() on parisc architecture
> Applying: sched: /proc/sched_stat fails on very very large machines
> Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-fix
> Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2
> Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix
> Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix-fix
> Applying: sched: /proc/sched_debug fails on very very large machines
> Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-fix
> Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2
> Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2-fix
> Applying: block: restore /proc/partitions to not display non-partitionable removable devices
> Applying: fs: change return values from -EACCES to -EPERM
> Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
> Applying: fs: return EAGAIN when O_NONBLOCK write should block on frozen fs
> Applying: fs: fix hang with BSD accounting on frozen filesystem
> Applying: ocfs2: add freeze protection to ocfs2_file_splice_write()
> Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
> Applying: mm: memmap_init_zone() performance improvement
> Applying: mm: remove free_area_cache
> Applying: include/linux/mmzone.h: cleanups
> Applying: include-linux-mmzoneh-cleanups-fix
> Applying: mm: accelerate munlock() treatment of THP pages
> Applying: drop_caches: add some documentation and info message
> Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
> Applying: mm/dmapool.c: fix null dev in dma_pool_create()
> Applying: memcg: debugging facility to access dangling memcgs
> Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
> Applying: mm: add vm event counters for balloon pages compaction
> Applying: mm: use vm_unmapped_area() on frv architecture
> Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
> Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
> Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock
> Applying: kernel/smp.c: cleanups
> Applying: get_maintainer: allow keywords to match filenames
> Applying: MAINTAINERS: Remove Mark M. Hoffman
> Applying: maintainers-remove-mark-m-hoffman-fix
> Applying: backlight: add new lp8788 backlight driver
> Applying: backlight-add-new-lp8788-backlight-driver-checkpatch-fixes
> Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
> Applying: lib/scatterlist: add simple page iterator
> Applying: lib/scatterlist: use page iterator in the mapping iterator
> Applying: epoll: support for disabling items, and a self-test app
> Applying: epoll: stop comparing pointers with 0 in self-test app
> Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
> Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue
> Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix
> Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix
> Applying: rtc-ds1307-long-block-operations-bugfix-fix
> Applying: arm: mvebu: add RTC support for Armada 370 and Armada XP
> Applying: hfsplus: add osx.* prefix for handling namespace of Mac OS X extended attributes
> Applying: hfsplus: add on-disk layout declarations related to attributes tree
> Applying: hfsplus: add functionality of manipulating by records in attributes tree
> Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
> Applying: hfsplus: add support of manipulation by attributes file
> Applying: hfsplus: fix issue with unzeroed unused b-tree nodes
> Applying: fat: add extended fileds to struct fat_boot_sector
> Applying: fat: mark fs as dirty on mount and clean on umount
> Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
> Applying: Documentation/cgroups/blkio-controller.txt: fix typo
> Applying: signal: allow to send any siginfo to itself
> Applying: signal-allow-to-send-any-siginfo-to-itself-fix
> Applying: kernel/signal.c - fix suboptimal printk usage
> Applying: coredump: remove redundant defines for dumpable states
> Applying: fs/proc: clean up printks
> Applying: fs-proc-clean-up-printks-fix
> Applying: fs-proc-clean-up-printks-fix-fix
> Applying: fs/proc/vmcore.c: put if tests in the top of the while loop to reduce duplication
> Applying: fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix
> Applying: fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix-fix
> Applying: vfork: don't freezer_count() for in-kernel users of CLONE_VFORK
> Applying: lockdep: check that no locks held at freeze time
> Applying: lockdep-check-that-no-locks-held-at-freeze-time-fix
> Applying: coredump: cleanup the waiting for coredump_finish code
> Applying: coredump: use a freezable_schedule for the coredump_finish wait
> Applying: coredump: abort core dump piping only due to a fatal signal
> Applying: seq-file: use SEEK_ macros instead of hardcoded numbers
> Applying: fs/seq_file.c:seq_lseek(): fix switch statement indenting
> Applying: fs-seq_filec-seq_lseek-fix-switch-statement-indenting-checkpatch-fixes
> Applying: fork: unshare: remove dead code
> Applying: fs/exec.c: make bprm_mm_init() static
> Applying: kexec: add the values related to buddy system for filtering free pages.
> Applying: kexec: get rid of duplicate check for hole_end
> Applying: kexec: export PG_hwpoison flag into vmcoreinfo
> Applying: block: fix ext_devt_idr handling
> Applying: idr: fix a subtle bug in idr_get_next()
> Applying: idr: make idr_destroy() imply idr_remove_all()
> Applying: atm/nicstar: don't use idr_remove_all()
> Applying: block/loop: don't use idr_remove_all()
> Applying: firewire: don't use idr_remove_all()
> Applying: drm: don't use idr_remove_all()
> Applying: dm: don't use idr_remove_all()
> Applying: remoteproc: don't use idr_remove_all()
> Applying: rpmsg: don't use idr_remove_all()
> Applying: dlm: use idr_for_each_entry() in recover_idr_clear() error path
> Applying: dlm: don't use idr_remove_all()
> Applying: nfs: idr_destroy() no longer needs idr_remove_all()
> Applying: inotify: don't use idr_remove_all()
> Applying: cgroup: don't use idr_remove_all()
> Applying: nfsd: idr_destroy() no longer needs idr_remove_all()
> Applying: idr: deprecate idr_remove_all()
> Applying: idr: cosmetic updates to struct / initializer definitions
> Applying: idr: relocate idr_for_each_entry() and reorganize id[r|a]_get_new()
> Applying: idr: remove _idr_rc_to_errno() hack
> Applying: idr: refactor idr_get_new_above()
> Applying: idr: implement idr_preload[_end]() and idr_alloc()
> Applying: idr: implement idr_preload[_end]() and idr_alloc()
> Applying: block: fix synchronization and limit check in blk_alloc_devt()
> Applying: block: convert to idr_alloc()
> Applying: block/loop: convert to idr_alloc()
> Applying: atm/nicstar: convert to idr_alloc()
> Applying: drbd: convert to idr_alloc()
> Applying: dca: convert to idr_alloc()
> Applying: dmaengine: convert to idr_alloc()
> Applying: firewire: add minor number range check to fw_device_init()
> Applying: firewire: convert to idr_alloc()
> Applying: firewire: fw_device_init: 'minor' may be used uninitialized
> Applying: gpio: convert to idr_alloc()
> Applying: drm: convert to idr_alloc()
> Applying: drm: missing idr_preload_end in drm_gem_flink_ioctl
> Applying: drm-convert-to-idr_alloc-fix-fix
> Applying: drm/exynos: convert to idr_alloc()
> Applying: drm/i915: convert to idr_alloc()
> Applying: drm/sis: convert to idr_alloc()
> Applying: drm/via: convert to idr_alloc()
> Applying: drm/vmwgfx: convert to idr_alloc()
> Applying: i2c: convert to idr_alloc()
> Applying: i2c-convert-to-idr_alloc-fix
> Applying: i2c: style cleanups after idr_alloc() conversion
> Applying: IB/core: convert to idr_alloc()
> Applying: IB/amso1100: convert to idr_alloc()
> Applying: IB/cxgb3: convert to idr_alloc()
> Applying: IB/cxgb4: convert to idr_alloc()
> Applying: IB/ehca: convert to idr_alloc()
> Applying: IB/ipath: convert to idr_alloc()
> Applying: IB/mlx4: convert to idr_alloc()
> Applying: IB/ocrdma: convert to idr_alloc()
> Applying: IB/qib: convert to idr_alloc()
> Applying: dm: convert to idr_alloc()
> Applying: memstick: convert to idr_alloc()
> Applying: mfd: convert to idr_alloc()
> Applying: misc/c2port: convert to idr_alloc()
> Applying: misc/tifm_core: convert to idr_alloc()
> Applying: mmc: convert to idr_alloc()
> Applying: mtd: convert to idr_alloc()
> Applying: macvtap: convert to idr_alloc()
> Applying: ppp: convert to idr_alloc()
> Applying: power: convert to idr_alloc()
> Applying: pps: convert to idr_alloc()
> Applying: remoteproc: convert to idr_alloc()
> Applying: rpmsg: convert to idr_alloc()
> Applying: scsi/bfa: convert to idr_alloc()
> Applying: scsi: convert to idr_alloc()
> Applying: target/iscsi: convert to idr_alloc()
> Applying: scsi/lpfc: convert to idr_alloc()
> Applying: thermal: convert to idr_alloc()
> Applying: uio: convert to idr_alloc()
> Applying: vfio: convert to idr_alloc()
> Applying: dlm: convert to idr_alloc()
> Applying: inotify: convert to idr_alloc()
> Applying: ocfs2: convert to idr_alloc()
> Applying: ipc: convert to idr_alloc()
> Applying: ipc-convert-to-idr_alloc-fix
> Applying: cgroup: convert to idr_alloc()
> Applying: events: convert to idr_alloc()
> Applying: posix-timers: convert to idr_alloc()
> Applying: net/9p: convert to idr_alloc()
> Applying: mac80211: convert to idr_alloc()
> Applying: sctp: convert to idr_alloc()
> Applying: nfs4client: convert to idr_alloc()
> Applying: idr: fix top layer handling
> Applying: idr: remove MAX_IDR_MASK and move left MAX_IDR_* into idr.c
> Applying: idr: remove length restriction from idr_layer->bitmap
> Applying: idr-remove-length-restriction-from-idr_layer-bitmap-checkpatch-fixes
> Applying: idr: make idr_layer larger
> Applying: idr: add idr_layer->prefix
> Applying: idr: implement lookup hint
> Applying: ipc/sem.c: alternatives to preempt_disable()
> Applying: ipmi: remove superfluous kernel/userspace explanation
> Applying: ipmi: add new kernel options to prevent automatic ipmi init
> Applying: ipmi: add options to disable openfirmware and PCI scanning
> Applying: drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally
> Applying: drivers-char-miscc-misc_register-do-not-loop-on-misc_list-unconditionally-fix
> Applying: block/partition/msdos: detect AIX formatted disks even without 55aa
> Applying: block/partitions/efi.c: ensure that the GPT header is at least the size of the structure.
> Applying: sysctl: fix null checking in bin_dn_node_address()
> Applying: kernel/utsname_sysctl.c: put get/get_uts() into CONFIG_PROC_SYSCTL code block
> Applying: nbd: support FLUSH requests
> Applying: nbd: fsync and kill block device on shutdown
> Applying: nbd: show read-only state in sysfs
> Applying: nbd: update documentation and link to mailinglist
> Applying: kernel/utsname.c: fix wrong comment about clone_uts_ns()
> Applying: mtd: mtd_nandecctest: use prandom_bytes instead of get_random_bytes()
> Applying: mtd: mtd_oobtest: convert to use prandom library
> Applying: mtd: mtd_pagetest: convert to use prandom library
> Applying: mtd: mtd_speedtest: use prandom_bytes
> Applying: mtd: mtd_subpagetest: convert to use prandom library
> Applying: mtd: mtd_stresstest: use prandom_bytes()
> Applying: include/linux/eventfd.h: fix incorrect filename is a comment
> Applying: Documentation/DMA-API-HOWTO.txt: fix typo
> Applying: drivers/pps/clients/pps-gpio.c: use devm_kzalloc
> Applying: w1: add support for DS2413 Dual Channel Addressable Switch
> Applying: ocfs2: fix possible use-after-free with AIO
> Applying: mm: remove old aio use_mm() comment
> Applying: aio: remove dead code from aio.h
> Applying: gadget: remove only user of aio retry
> Applying: aio: remove retry-based AIO
> Applying: char: add aio_{read,write} to /dev/{null,zero}
> Applying: aio: kill return value of aio_complete()
> Applying: aio: add kiocb_cancel()
> Applying: aio-kiocb_cancel-fix
> Applying: aio: move private stuff out of aio.h
> Applying: aio: dprintk() -> pr_debug()
> Applying: aio: do fget() after aio_get_req()
> Applying: aio: make aio_put_req() lockless
> Applying: aio: refcounting cleanup
> Applying: wait: add wait_event_hrtimeout()
> Applying: wait-add-wait_event_hrtimeout-fix
> Applying: aio: make aio_read_evt() more efficient, convert to hrtimers
> Applying: aio: use flush_dcache_page()
> Applying: aio: use cancellation list lazily
> Applying: aio-use-cancellation-list-lazily-fix
> Applying: aio-use-cancellation-list-lazily-fix-fix
> Applying: aio: change reqs_active to include unreaped completions
> Applying: aio: kill batch allocation
> Applying: aio: kill struct aio_ring_info
> Applying: aio: give shared kioctx fields their own cachelines
> Applying: aio-give-shared-kioctx-fields-their-own-cachelines-fix
> Applying: aio: reqs_active -> reqs_available
> Applying: aio: percpu reqs_available
> Applying: generic dynamic per cpu refcounting
> Applying: generic-dynamic-per-cpu-refcounting-fix
> Applying: percpu-refcount: sparse fixes
> Applying: generic-dynamic-per-cpu-refcounting-sparse-fixes-fix
> Applying: generic-dynamic-per-cpu-refcounting-doc
> Applying: generic-dynamic-per-cpu-refcounting-doc-fix
> Applying: aio: percpu ioctx refcount
> Applying: aio: use xchg() instead of completion_lock
> Applying: aio: don't include aio.h in sched.h
> Applying: aio-dont-include-aioh-in-schedh-fix
> Applying: aio-dont-include-aioh-in-schedh-fix-fix
> Applying: aio-dont-include-aioh-in-schedh-fix-3
> Applying: aio-dont-include-aioh-in-schedh-fix-3-fix
> Applying: aio-dont-include-aioh-in-schedh-fix-3-fix-fix
> Applying: aio: kill ki_key
> Applying: aio: kill ki_retry
> Applying: aio-kill-ki_retry-fix
> Applying: aio-kill-ki_retry-fix-fix
> Applying: block, aio: batch completion for bios/kiocbs
> Applying: block-aio-batch-completion-for-bios-kiocbs-fix
> Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix
> Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix
> Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix
> Applying: Fix build error due to bio_endio_batch
> Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix
> Applying: aio: Fix a null pointer deref in batch_complete_aio
> Applying: virtio-blk: convert to batch completion
> Applying: mtip32xx: convert to batch completion
> Applying: aio: fix aio_read_events_ring() types
> Applying: aio: document, clarify aio_read_events() and shadow_tail
> Applying: aio: correct calculation of available events
> Applying: aio: fix kioctx not being freed after cancellation at exit time
> Applying: aio: v3: fix kioctx not being freed after cancellation at exit time
> Applying: arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS
> Applying: kfifo: move kfifo.c from kernel/ to lib/
> Applying: kfifo: fix kfifo_alloc() and kfifo_init()
> Applying: selftests: add tests for efivarfs
> Applying: selftests-add-tests-for-efivarfs-fix
> Applying: selftests-add-tests-for-efivarfs-fix-fix
> Applying: selftests/efivarfs: add empty file creation test
> Applying: selftests/efivarfs: add create-read test
> Applying: tools/testing/selftests/Makefile: rearrange targets
> Applying: selftests: add a simple doc
> Applying: selftests-add-a-simple-doc-fix
> Applying: kcmp: make it depend on CHECKPOINT_RESTORE
> Applying: hlist: drop the node parameter from iterators
> Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix-fix-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-checkpatch-fixes
> Applying: hlist-drop-the-node-parameter-from-iterators-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-redo-kvm
> Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix-fix-fix-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-mlx4-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-qlnic-fix
> Applying: hlist-drop-the-node-parameter-from-iterators-qlnic-2-fix
> Merging akpm/master (9dd7c8f hlist-drop-the-node-parameter-from-iterators-qlnic-2-fix)

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2013-02-26  3:16 Stephen Rothwell
  2013-02-26  5:00 ` Sedat Dilek
  0 siblings, 1 reply; 30+ messages in thread
From: Stephen Rothwell @ 2013-02-26  3:16 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 43233 bytes --]

Hi all,

Please do not add any work destined for v3.10 to your -next included
branches until after Linus has release v3.9-rc1.

Changes since 20130223:

The kbuild tree lost its build failure.

The infiniband tree gained a conflict against Linus' tree.

The drm tree still has its build failure for which I applied a patch.

----------------------------------------------------------------------------

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 216 trees (counting Linus' and 28 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 Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (ab78265 Merge tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6)
Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
Merging arm-current/fixes (b255188 ARM: fix scheduling while atomic warning in alignment handling code)
Merging m68k-current/for-linus (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
Merging powerpc-merge/merge (eda8eeb powerpc/mm: Fix hash computation function)
Merging sparc/master (f9fd348 sparc32: refactor smp boot)
Merging net/master (eb970ff usbnet: smsc95xx: rename FEATURE_AUTOSUSPEND)
Merging ipsec/master (85dfb74 af_key: initialize satype in key_notify_policy_flush())
Merging sound-current/for-linus (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU)
Merging pci-current/for-linus (249bfb8 PCI/PM: Clean up PME state when removing a device)
Merging wireless/master (dc4a787 brcmfmac: fix missing unlock on error in brcmf_notify_vif_event())
Merging driver-core.current/driver-core-linus (949db15 Linux 3.8-rc5)
Merging tty.current/tty-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging usb.current/usb-linus (74e1a2a Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging staging.current/staging-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging char-misc.current/char-misc-linus (7ed214a Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging input-current/for-linus (171fb58 Input: ALPS - update documentation for recent touchpad driver mods)
Merging md-current/for-linus (c43a660 md/raid1,raid10: fix deadlock with freeze_array())
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (8fd61d3 crypto: user - ensure user supplied strings are nul-terminated)
CONFLICT (content): Merge conflict in drivers/crypto/omap-sham.c
CONFLICT (content): Merge conflict in crypto/ctr.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/crypto/fsl-sec4.txt
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option)
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().)
Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG)
Merging rr-fixes/fixes (aded024 virtio_console: Don't access uninitialized data.)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (fc32781 ARC: [plat-arcfpga] DT arc-uart bindings change: "baud" => "current-speed")
CONFLICT (content): Merge conflict in init/Kconfig
Merging arm/for-next (b47ce09 Merge branches 'devel-stable', 'fixes' and 'mmci' into for-next)
Merging arm-perf/for-next/perf (5ef1240 Merge branches 'for-rmk/hw-breakpoint' and 'for-rmk/perf' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (42ead3a arm: zynq: timer: Set clock_event cpumask)
CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c
Merging arm64/upstream (ec45d1c arm64: mm: update CONTEXTIDR register to contain PID of current process)
Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment)
Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h)
Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/)
Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
Merging ia64/next (c9500a7 Merge branch 'pstore' into next)
Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
Merging m68knommu/for-next (8a67f21 m68knommu: fix trap on execing /bin/init)
Merging metag/for-next (068bf1c metag: prom.h: remove declaration of metag_dt_memblock_reserve())
CONFLICT (content): Merge conflict in tools/perf/perf.h
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging microblaze/next (711e5b4 asm-generic: io: Fix ioread16/32be and iowrite16/32be)
Merging mips/mips-for-linux-next (19aa5ac Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/kernel/syscall.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal_n32.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal32.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal.c
CONFLICT (content): Merge conflict in arch/mips/kernel/scall64-o32.S
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c
CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/cvmx-helper-util.h
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-util.c
Merging openrisc/for-upstream (ae6fef17 openrisc: really pass correct arg to schedule_tail)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging powerpc/next (8520e44 powerpc/kexec: Disable hard IRQ before kexec)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (fa59f17 powerpc/5200: Use the gpt* labels to simplify mpc5200 dts files)
Merging galak/next (12c7e8f powerpc/85xx: l2sram - Add compatible string for BSC9131 platform)
Merging s390/features (7f46a97 s390/uaccess: fix kernel ds access for page table walk)
Merging sh/sh-latest (035688d sh: ecovec: add sample amixer settings)
Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc)
Merging tile/master (ecc46c5 tile: support atomic64_dec_if_positive())
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (c50842d xtensa: add support for TLS)
Merging btrfs/next (dc81cdc Btrfs: fix remount vs autodefrag)
Merging ceph/master (3ebc21f libceph: fix messenger CONFIG_BLOCK dependencies)
Merging cifs/for-next (68851c4 cifs: set MAY_SIGN when sec=krb5)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (1101d58 ecryptfs: ecryptfs_msg_ctx_alloc_to_free(): remove kfree() redundant null check)
Merging ext3/for_next (712ddc5 Ext2: remove the static function release_blocks to optimize the kernel)
Merging ext4/dev (304e220 ext4: fix free clusters calculation in bigalloc filesystem)
Merging f2fs/dev (7dd690c f2fs: avoid build warning)
Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use)
Merging gfs2/master (fd95e81 GFS2: Reinstate withdraw ack system)
Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (78f3327 pnfs: fix resend_to_mds for directio)
Merging nfsd/nfsd-next (56edc86 nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (b6f4bee fs/9p: Fix atomic_open)
Merging ubifs/linux-next (8afd500 UBIFS: fix double free of ubifs_orphan objects)
Merging xfs/for-next (1e82379 xfs: xfs_bmap_add_attrfork_local is too generic)
Merging vfs/for-next (d526cc4 vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op)
Merging pci/next (018ba0a Merge branch 'pci/yinghai-root-bus-hotplug' into next)
CONFLICT (content): Merge conflict in drivers/pci/pci-acpi.c
CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in drivers/acpi/internal.h
CONFLICT (content): Merge conflict in arch/ia64/pci/pci.c
Merging hid/for-next (e3dc8bf Merge branch 'for-3.9/logitech' into for-next)
Merging i2c/i2c/for-next (55827f4 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-s3c2410.c
Merging jdelvare-hwmon/master (54e37b8 Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio)
Merging hwmon-staging/hwmon-next (55529fa Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging v4l-dvb/master (eccaaad Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (26901f2 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
CONFLICT (modify/delete): kernel/timeconst.pl deleted in kbuild/for-next and modified in HEAD. Version HEAD of kernel/timeconst.pl left in tree.
$ git rm -f kernel/timeconst.pl
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/NEXT (53637e0 [libata] fix smatch warning for zpodd_wake_dev)
Merging infiniband/for-next (b45a49c Merge branch 'ipoib' into for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/mlx4.h
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change)
Merging pm/linux-next (4383822 Merge branch 'acpi-pm' into fixes)
Merging idle/next (ca62cf5 Merge branch 'misc' into release)
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpuidle/cpuidle-next (d1c3ed6 Linux 3.8-rc2)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (ef3ac3a Revert "Thermal: exynos: Add sysfs node supporting exynos's emulation mode.")
Applying: sched/rt: fix PowerClamp Driver for define move
Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast())
Merging ubi/linux-next (19f949f Linux 3.8)
Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (319cc77 Merge branch 'misc' into for-next)
Merging target-updates/for-next (972b29c target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors)
Merging target-merge/for-next-merge (d1c3ed6 Linux 3.8-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (17166a3 Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT")
CONFLICT (content): Merge conflict in drivers/dma/tegra20-apb-dma.c
CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
CONFLICT (content): Merge conflict in drivers/dma/dw_dmac.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear6xx/spear6xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear3xx/spear3xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dma.c
Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock)
CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
Merging net-next/master (a0b1c42 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging ipsec-next/master (a0b1c42 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Merging wireless-next/master (b53cf45 net: wireless: hostap: hostap_ap.c: Return -ENOMEM instead of -1 for if kmalloc() fails.)
Merging bluetooth/master (a884a82 Bluetooth: Rename hci_acl_disconn)
Merging mtd/master (0ce82b7 mtd: nand: onfi don't WARN if we are in 16 bits mode)
Merging l2-mtd/master (24dea0c mtd: map: BUG() in non handled cases)
Merging crypto/master (7eb9c5d crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.)
Merging drm/drm-next (28ee461 Merge branch 'drm/hdmi-for-3.9' of git://anongit.freedesktop.org/tegra/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen_cs.c
Applying: drm/tilcdc: only build on arm
Merging drm-intel/drm-intel-next-queued (90a72f8 drm/i915: Refactor gen2 to gen4 vblank interrupt handling)
Merging sound/for-next (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU)
Merging sound-asoc/for-next (5475931 Merge remote-tracking branch 'asoc/topic/da7213' into asoc-next)
Merging modules/modules-next (d9d8d7e MODSIGN: Add option to not sign modules during modules_install)
Merging pekey/devel-pekey (4ea349d MODSIGN: Fix including certificate twice when the signing_key.x509 already exists)
Merging virtio/virtio-next (8078db7 virtio_console: Initialize guest_connected=true for rproc_serial)
Merging input/next (005a69d Input: cyttsp-spi - remove duplicate MODULE_ALIAS())
Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
Merging cgroup/for-next (5d30b00 Merge branch 'for-3.9' into for-next)
Merging block/for-next (833dd2e Merge branch 'for-3.9/drivers' into for-next)
Merging device-mapper/master (6b3df99 Add a persistent bitset as a wrapper around dm-array.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (0e78610 mmc: tegra: assume CONFIG_OF, remove platform data)
Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
Merging slab/for-next (b1e0541 mm/sl[au]b: correct allocation type check in kmalloc_slab())
Merging uclinux/for-next (b69f085 Linux 3.7-rc8)
Merging md/for-next (eaa0945 raid5: create multiple threads to handle stripes)
Merging mfd/for-next (ff7109f mfd: lpc_ich: Use devres API to allocate private data)
Merging battery/master (845e37e Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux)
CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500-bm.h
Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus)
Merging regulator/for-next (2730fd8 Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next)
Merging security/next (5b26603 tpm/ibmvtpm: build only when IBM pseries is configured)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (144ff55 watchdog: davinci_wdt: update to devm_* API)
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
CONFLICT (content): Merge conflict in drivers/rtc/rtc-stmp3xxx.c
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (604542b Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next)
CONFLICT (content): Merge conflict in drivers/iommu/tegra-smmu.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-exynos5-dt.c
Merging vfio/next (d65530f drivers/vfio: remove depends on CONFIG_EXPERIMENTAL)
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (df63447 DocBook: update EXPORT_SYMBOL entry to point at export.h)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging edac/linux_next (8ae8f50 ghes_edac: Fix RAS tracing)
Merging edac-amd/for-next (e7d2c21 mpc85xx_edac: Fix typo)
Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add")
Merging dt-rh/for-next (1421954 documentation/devicetree: Fix a typo in exynos-dw-mshc.txt)
Merging spi/spi/next (095c375 spi: Document cs_gpios and cs_gpio in kernel-doc)
Merging spi-mb/spi-next (a349685 spi/pxa2xx: add support for Lynxpoint SPI controllers)
Merging tip/auto-latest (641e71a Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h
Merging ftrace/for-next (8c189ea ftrace: Call ftrace cleanup module notifier after all other notifiers)
Merging rcu/rcu/next (7a6b55e srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock())
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (bd31a7f KVM: nVMX: Trap unconditionally if msr bitmap access fails)
Merging kvm-ppc/kvm-ppc-next (899f7b2 Merge commit 'origin/next' into kvm-ppc-next)
Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (39ada15 Merge branch 'stable/for-linus-3.9-take-two' into linux-next)
Applying: xen: fix bad merge of arch/x86/xen/mmu.c
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument)
Merging workqueues/for-next (a4791ca Merge branch 'for-3.9' into for-next)
Merging drivers-x86/linux-next (8732068 ideapad: depends on backlight subsystem and update comment)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (a2b37ef Merge remote-tracking branch 'regmap/topic/no-bus' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (4b07c5d leds: leds-sunfire: use dev_err()/pr_err() instead of printk())
Merging driver-core/driver-core-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging tty/tty-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging usb/usb-next (74e1a2a Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging staging/staging-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging char-misc/char-misc-next (7ed214a Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (ade158e pinctrl: tegra: add clfvs function to Tegra114 support)
Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq)
Merging gpio/gpio/next (9170100 arm64: select ARCH_WANT_OPTIONAL_GPIOLIB)
Merging gpio-lw/for-next (c7886b1 gpio: em: Use irq_domain_add_simple() to fix runtime error)
Merging arm-soc/for-next (1ead4fb Merge branch 'late/mvebu-dt' into for-next)
CONFLICT (content): Merge conflict in include/linux/mmc/host.h
CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-pxav3.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-esdhc-imx.c
CONFLICT (add/add): Merge conflict in drivers/mmc/host/sdhci-bcm2835.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sdio.c
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-370-xp.dtsi
Merging bcm2835/for-next (836dc9e Linux 3.8-rc7)
Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n)
CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h
Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
Merging msm/for-next (a0d271c Linux 3.6)
Merging renesas/next (69cde01 Merge branches 'heads/defconfig', 'heads/boards3', 'boards-kzm9g-reference', 'heads/pfc' and 'heads/clocksource' into next)
Merging samsung/for-next (786b270 Merge branch 'next/cpufreq-exynos' into for-next)
Merging tegra/for-next (b76340f Merge branch 'for-3.9/soc-ccf-fixes' into for-next)
Merging dma-mapping/dma-mapping-next (d589829 ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation)
Merging pwm/for-next (30f7861 pwm: twl: Use to_twl() instead of container_of())
Merging dma-buf/for-next (6764143 CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap)
Merging userns/for-next (139321c cifs: Enable building with user namespaces enabled.)
CONFLICT (content): Merge conflict in net/sunrpc/svcauth_unix.c
Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check)
Merging signal/for-next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal)
Merging clk/clk-next (fde8bc5 clk: sunxi: remove stale Makefile entry)
Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool)
Merging lzo-update/lzo-update (0ec7382 crypto: testmgr - update LZO compression test vectors)
Merging modem_shm/remoteproc-next (c68dc8d remoteproc: Always perserve resource table data)
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (6df6a56 device_cgroup: don't grab mutex in rcu callback)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: proc: avoid extra pde_put() in proc_fill_super()
Applying: x86 numa: don't check if node is NUMA_NO_NODE
Applying: Revert "x86, mm: Make spurious_fault check explicitly check the PRESENT bit"
Applying: pageattr: prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
Applying: x86: make 'mem=' option to work for efi platform
Applying: mm: remove free_area_cache use in powerpc architecture
Applying: mm: use vm_unmapped_area() on powerpc architecture
Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: timer_list: split timer_list_show_tickdevices()
Applying: timer_list: convert timer list to be a proper seq_file
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2-fix
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
Applying: mm: use vm_unmapped_area() on ia64 architecture
Applying: mm: use vm_unmapped_area() in hugetlbfs on ia64 architecture
Applying: mm: use vm_unmapped_area() on parisc architecture
Applying: sched: /proc/sched_stat fails on very very large machines
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-fix
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix
Applying: sched-proc-sched_stat-fails-on-very-very-large-machines-v2-fix-fix
Applying: sched: /proc/sched_debug fails on very very large machines
Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-fix
Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2
Applying: sched-proc-sched_debug-fails-on-very-very-large-machines-v2-fix
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: fs: change return values from -EACCES to -EPERM
Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
Applying: fs: return EAGAIN when O_NONBLOCK write should block on frozen fs
Applying: fs: fix hang with BSD accounting on frozen filesystem
Applying: ocfs2: add freeze protection to ocfs2_file_splice_write()
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: mm: memmap_init_zone() performance improvement
Applying: mm: remove free_area_cache
Applying: include/linux/mmzone.h: cleanups
Applying: include-linux-mmzoneh-cleanups-fix
Applying: mm: accelerate munlock() treatment of THP pages
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: memcg: debugging facility to access dangling memcgs
Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
Applying: mm: add vm event counters for balloon pages compaction
Applying: mm: use vm_unmapped_area() on frv architecture
Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock
Applying: kernel/smp.c: cleanups
Applying: get_maintainer: allow keywords to match filenames
Applying: MAINTAINERS: Remove Mark M. Hoffman
Applying: maintainers-remove-mark-m-hoffman-fix
Applying: backlight: add new lp8788 backlight driver
Applying: backlight-add-new-lp8788-backlight-driver-checkpatch-fixes
Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
Applying: lib/scatterlist: add simple page iterator
Applying: lib/scatterlist: use page iterator in the mapping iterator
Applying: epoll: support for disabling items, and a self-test app
Applying: epoll: stop comparing pointers with 0 in self-test app
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue
Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix
Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix
Applying: rtc-ds1307-long-block-operations-bugfix-fix
Applying: arm: mvebu: add RTC support for Armada 370 and Armada XP
Applying: hfsplus: add osx.* prefix for handling namespace of Mac OS X extended attributes
Applying: hfsplus: add on-disk layout declarations related to attributes tree
Applying: hfsplus: add functionality of manipulating by records in attributes tree
Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
Applying: hfsplus: add support of manipulation by attributes file
Applying: hfsplus: fix issue with unzeroed unused b-tree nodes
Applying: fat: add extended fileds to struct fat_boot_sector
Applying: fat: mark fs as dirty on mount and clean on umount
Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
Applying: Documentation/cgroups/blkio-controller.txt: fix typo
Applying: signal: allow to send any siginfo to itself
Applying: signal-allow-to-send-any-siginfo-to-itself-fix
Applying: kernel/signal.c - fix suboptimal printk usage
Applying: coredump: remove redundant defines for dumpable states
Applying: fs/proc: clean up printks
Applying: fs-proc-clean-up-printks-fix
Applying: fs-proc-clean-up-printks-fix-fix
Applying: fs/proc/vmcore.c: put if tests in the top of the while loop to reduce duplication
Applying: fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix
Applying: fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix-fix
Applying: vfork: don't freezer_count() for in-kernel users of CLONE_VFORK
Applying: lockdep: check that no locks held at freeze time
Applying: lockdep-check-that-no-locks-held-at-freeze-time-fix
Applying: coredump: cleanup the waiting for coredump_finish code
Applying: coredump: use a freezable_schedule for the coredump_finish wait
Applying: coredump: abort core dump piping only due to a fatal signal
Applying: seq-file: use SEEK_ macros instead of hardcoded numbers
Applying: fs/seq_file.c:seq_lseek(): fix switch statement indenting
Applying: fs-seq_filec-seq_lseek-fix-switch-statement-indenting-checkpatch-fixes
Applying: fork: unshare: remove dead code
Applying: fs/exec.c: make bprm_mm_init() static
Applying: kexec: add the values related to buddy system for filtering free pages.
Applying: kexec: get rid of duplicate check for hole_end
Applying: kexec: export PG_hwpoison flag into vmcoreinfo
Applying: block: fix ext_devt_idr handling
Applying: idr: fix a subtle bug in idr_get_next()
Applying: idr: make idr_destroy() imply idr_remove_all()
Applying: atm/nicstar: don't use idr_remove_all()
Applying: block/loop: don't use idr_remove_all()
Applying: firewire: don't use idr_remove_all()
Applying: drm: don't use idr_remove_all()
Applying: dm: don't use idr_remove_all()
Applying: remoteproc: don't use idr_remove_all()
Applying: rpmsg: don't use idr_remove_all()
Applying: dlm: use idr_for_each_entry() in recover_idr_clear() error path
Applying: dlm: don't use idr_remove_all()
Applying: nfs: idr_destroy() no longer needs idr_remove_all()
Applying: inotify: don't use idr_remove_all()
Applying: cgroup: don't use idr_remove_all()
Applying: nfsd: idr_destroy() no longer needs idr_remove_all()
Applying: idr: deprecate idr_remove_all()
Applying: idr: cosmetic updates to struct / initializer definitions
Applying: idr: relocate idr_for_each_entry() and reorganize id[r|a]_get_new()
Applying: idr: remove _idr_rc_to_errno() hack
Applying: idr: refactor idr_get_new_above()
Applying: idr: implement idr_preload[_end]() and idr_alloc()
Applying: idr: implement idr_preload[_end]() and idr_alloc()
Applying: block: fix synchronization and limit check in blk_alloc_devt()
Applying: block: convert to idr_alloc()
Applying: block/loop: convert to idr_alloc()
Applying: atm/nicstar: convert to idr_alloc()
Applying: drbd: convert to idr_alloc()
Applying: dca: convert to idr_alloc()
Applying: dmaengine: convert to idr_alloc()
Applying: firewire: add minor number range check to fw_device_init()
Applying: firewire: convert to idr_alloc()
Applying: firewire: fw_device_init: 'minor' may be used uninitialized
Applying: gpio: convert to idr_alloc()
Applying: drm: convert to idr_alloc()
Applying: drm: missing idr_preload_end in drm_gem_flink_ioctl
Applying: drm-convert-to-idr_alloc-fix-fix
Applying: drm/exynos: convert to idr_alloc()
Applying: drm/i915: convert to idr_alloc()
Applying: drm/sis: convert to idr_alloc()
Applying: drm/via: convert to idr_alloc()
Applying: drm/vmwgfx: convert to idr_alloc()
Applying: i2c: convert to idr_alloc()
Applying: i2c-convert-to-idr_alloc-fix
Applying: i2c: style cleanups after idr_alloc() conversion
Applying: IB/core: convert to idr_alloc()
Applying: IB/amso1100: convert to idr_alloc()
Applying: IB/cxgb3: convert to idr_alloc()
Applying: IB/cxgb4: convert to idr_alloc()
Applying: IB/ehca: convert to idr_alloc()
Applying: IB/ipath: convert to idr_alloc()
Applying: IB/mlx4: convert to idr_alloc()
Applying: IB/ocrdma: convert to idr_alloc()
Applying: IB/qib: convert to idr_alloc()
Applying: dm: convert to idr_alloc()
Applying: memstick: convert to idr_alloc()
Applying: mfd: convert to idr_alloc()
Applying: misc/c2port: convert to idr_alloc()
Applying: misc/tifm_core: convert to idr_alloc()
Applying: mmc: convert to idr_alloc()
Applying: mtd: convert to idr_alloc()
Applying: macvtap: convert to idr_alloc()
Applying: ppp: convert to idr_alloc()
Applying: power: convert to idr_alloc()
Applying: pps: convert to idr_alloc()
Applying: remoteproc: convert to idr_alloc()
Applying: rpmsg: convert to idr_alloc()
Applying: scsi/bfa: convert to idr_alloc()
Applying: scsi: convert to idr_alloc()
Applying: target/iscsi: convert to idr_alloc()
Applying: scsi/lpfc: convert to idr_alloc()
Applying: thermal: convert to idr_alloc()
Applying: uio: convert to idr_alloc()
Applying: vfio: convert to idr_alloc()
Applying: dlm: convert to idr_alloc()
Applying: inotify: convert to idr_alloc()
Applying: ocfs2: convert to idr_alloc()
Applying: ipc: convert to idr_alloc()
Applying: ipc-convert-to-idr_alloc-fix
Applying: cgroup: convert to idr_alloc()
Applying: events: convert to idr_alloc()
Applying: posix-timers: convert to idr_alloc()
Applying: net/9p: convert to idr_alloc()
Applying: mac80211: convert to idr_alloc()
Applying: sctp: convert to idr_alloc()
Applying: nfs4client: convert to idr_alloc()
Applying: idr: fix top layer handling
Applying: idr: remove MAX_IDR_MASK and move left MAX_IDR_* into idr.c
Applying: idr: remove length restriction from idr_layer->bitmap
Applying: idr-remove-length-restriction-from-idr_layer-bitmap-checkpatch-fixes
Applying: idr: make idr_layer larger
Applying: idr: add idr_layer->prefix
Applying: idr: implement lookup hint
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipmi: remove superfluous kernel/userspace explanation
Applying: ipmi: add new kernel options to prevent automatic ipmi init
Applying: ipmi: add options to disable openfirmware and PCI scanning
Applying: drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally
Applying: drivers-char-miscc-misc_register-do-not-loop-on-misc_list-unconditionally-fix
Applying: block/partition/msdos: detect AIX formatted disks even without 55aa
Applying: block/partitions/efi.c: ensure that the GPT header is at least the size of the structure.
Applying: sysctl: fix null checking in bin_dn_node_address()
Applying: kernel/utsname_sysctl.c: put get/get_uts() into CONFIG_PROC_SYSCTL code block
Applying: nbd: support FLUSH requests
Applying: nbd: fsync and kill block device on shutdown
Applying: nbd: show read-only state in sysfs
Applying: nbd: update documentation and link to mailinglist
Applying: kernel/utsname.c: fix wrong comment about clone_uts_ns()
Applying: mtd: mtd_nandecctest: use prandom_bytes instead of get_random_bytes()
Applying: mtd: mtd_oobtest: convert to use prandom library
Applying: mtd: mtd_pagetest: convert to use prandom library
Applying: mtd: mtd_speedtest: use prandom_bytes
Applying: mtd: mtd_subpagetest: convert to use prandom library
Applying: mtd: mtd_stresstest: use prandom_bytes()
Applying: include/linux/eventfd.h: fix incorrect filename is a comment
Applying: Documentation/DMA-API-HOWTO.txt: fix typo
Applying: drivers/pps/clients/pps-gpio.c: use devm_kzalloc
Applying: w1: add support for DS2413 Dual Channel Addressable Switch
Applying: ocfs2: fix possible use-after-free with AIO
Applying: mm: remove old aio use_mm() comment
Applying: aio: remove dead code from aio.h
Applying: gadget: remove only user of aio retry
Applying: aio: remove retry-based AIO
Applying: char: add aio_{read,write} to /dev/{null,zero}
Applying: aio: kill return value of aio_complete()
Applying: aio: add kiocb_cancel()
Applying: aio-kiocb_cancel-fix
Applying: aio: move private stuff out of aio.h
Applying: aio: dprintk() -> pr_debug()
Applying: aio: do fget() after aio_get_req()
Applying: aio: make aio_put_req() lockless
Applying: aio: refcounting cleanup
Applying: wait: add wait_event_hrtimeout()
Applying: wait-add-wait_event_hrtimeout-fix
Applying: aio: make aio_read_evt() more efficient, convert to hrtimers
Applying: aio: use flush_dcache_page()
Applying: aio: use cancellation list lazily
Applying: aio-use-cancellation-list-lazily-fix
Applying: aio-use-cancellation-list-lazily-fix-fix
Applying: aio: change reqs_active to include unreaped completions
Applying: aio: kill batch allocation
Applying: aio: kill struct aio_ring_info
Applying: aio: give shared kioctx fields their own cachelines
Applying: aio-give-shared-kioctx-fields-their-own-cachelines-fix
Applying: aio: reqs_active -> reqs_available
Applying: aio: percpu reqs_available
Applying: generic dynamic per cpu refcounting
Applying: generic-dynamic-per-cpu-refcounting-fix
Applying: percpu-refcount: sparse fixes
Applying: generic-dynamic-per-cpu-refcounting-sparse-fixes-fix
Applying: generic-dynamic-per-cpu-refcounting-doc
Applying: generic-dynamic-per-cpu-refcounting-doc-fix
Applying: aio: percpu ioctx refcount
Applying: aio: use xchg() instead of completion_lock
Applying: aio: don't include aio.h in sched.h
Applying: aio-dont-include-aioh-in-schedh-fix
Applying: aio-dont-include-aioh-in-schedh-fix-fix
Applying: aio-dont-include-aioh-in-schedh-fix-3
Applying: aio-dont-include-aioh-in-schedh-fix-3-fix
Applying: aio-dont-include-aioh-in-schedh-fix-3-fix-fix
Applying: aio: kill ki_key
Applying: aio: kill ki_retry
Applying: aio-kill-ki_retry-fix
Applying: aio-kill-ki_retry-fix-fix
Applying: block, aio: batch completion for bios/kiocbs
Applying: block-aio-batch-completion-for-bios-kiocbs-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix
Applying: Fix build error due to bio_endio_batch
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix
Applying: aio: Fix a null pointer deref in batch_complete_aio
Applying: virtio-blk: convert to batch completion
Applying: mtip32xx: convert to batch completion
Applying: aio: fix aio_read_events_ring() types
Applying: aio: document, clarify aio_read_events() and shadow_tail
Applying: aio: correct calculation of available events
Applying: aio: fix kioctx not being freed after cancellation at exit time
Applying: aio: v3: fix kioctx not being freed after cancellation at exit time
Applying: arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS
Applying: kfifo: move kfifo.c from kernel/ to lib/
Applying: kfifo: fix kfifo_alloc() and kfifo_init()
Applying: selftests: add tests for efivarfs
Applying: selftests-add-tests-for-efivarfs-fix
Applying: selftests-add-tests-for-efivarfs-fix-fix
Applying: selftests/efivarfs: add empty file creation test
Applying: selftests/efivarfs: add create-read test
Applying: tools/testing/selftests/Makefile: rearrange targets
Applying: selftests: add a simple doc
Applying: selftests-add-a-simple-doc-fix
Applying: kcmp: make it depend on CHECKPOINT_RESTORE
Applying: hlist: drop the node parameter from iterators
Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix-fix
Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix-fix-fix
Applying: hlist-drop-the-node-parameter-from-iterators-checkpatch-fixes
Applying: hlist-drop-the-node-parameter-from-iterators-fix
Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix
Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix
Applying: hlist-drop-the-node-parameter-from-iterators-redo-kvm
Applying: hlist-drop-the-node-parameter-from-iterators-fix-fix-fix-fix-fix-fix
Applying: hlist-drop-the-node-parameter-from-iterators-mlx4-fix
Applying: hlist-drop-the-node-parameter-from-iterators-qlnic-fix
Applying: hlist-drop-the-node-parameter-from-iterators-qlnic-2-fix
Merging akpm/master (9dd7c8f hlist-drop-the-node-parameter-from-iterators-qlnic-2-fix)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2012-02-24  6:05 Stephen Rothwell
  0 siblings, 0 replies; 30+ messages in thread
From: Stephen Rothwell @ 2012-02-24  6:05 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 41377 bytes --]

Hi all,

Changes since 20120223:

My fixes tree contains:
	tty/powerpc: early udbg consoles can't be modules
	x86, efi: Fix unaligned access and endian issues

The tip tree gained a conflict against the security tree and 2 build
failures for which I applied a patch and then used the version from
next-20120223.

The irqdomain tree gained a conflict against the powerpc tree.

The akpm tree still has a build failure for which I reverted a
patch.

----------------------------------------------------------------------------

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
and sparc64 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 182 trees (counting Linus' and 26 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.

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

$ git checkout master
$ git reset --hard stable
Merging origin/master (45196ce Merge tag 'usb-3.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging fixes/master (248419a x86, efi: Fix unaligned access and endian issues)
Merging kbuild-current/rc-fixes (6c63522 builddeb: Don't create files in /tmp with predictable names)
Merging arm-current/fixes (5180bb3 ARM/audit: include audit header and fix audit arch)
Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging powerpc-merge/merge (18b246f powerpc: Fix various issues with return to userspace)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers)
Merging scsi-rc-fixes/master (3569e53 [SCSI] scsi_dh_rdac: Fix for unbalanced reference count)
Merging net/master (e3e09f2 phy: IC+101G and PHY_HAS_INTERRUPT flag)
Merging sound-current/for-linus (cb74eb1 ALSA: snd-usb-caiaq: Fix the return of XRUN)
Merging pci-current/for-linus (1cc1c96 PCI: fix memleak when ACPI _CRS is not used.)
Merging wireless/master (2b0a53d brcm80211: smac: only print block-ack timeout message at trace level)
Merging driver-core.current/driver-core-linus (b01543d Linux 3.3-rc4)
Merging tty.current/tty-linus (b01543d Linux 3.3-rc4)
Merging usb.current/usb-linus (45196ce Merge tag 'usb-3.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging staging.current/staging-linus (b01543d Linux 3.3-rc4)
Merging char-misc.current/char-misc-linus (b01543d Linux 3.3-rc4)
Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging input-current/for-linus (82b982c Input: i8042 - add Lenovo Ideapad U455 to 'reset' blacklist)
Merging md-current/for-linus (db91ff5 md: two small fixes to handling interrupt resync.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (f2ea0f5 crypto: sha512 - use standard ror64())
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging devicetree-current/devicetree/merge (2261cc6 dt: add empty of_find_compatible_node function)
Merging spi-current/spi/merge (c88db23 spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver)
Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver)
Merging arm/for-next (5c8ae66 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (6abb754 Merge branch 'v3.4-for-cjb' into for-next)
Merging tegra/for-next (9048201 Merge branch 'for-3.4/soc-drivers' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (e651fe5 Blackfin: wire up new process_vm syscalls)
Merging c6x/for-linux-next (62e37ca Kbuild: Use dtc's -d (dependency) option)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (48e30fa [IA64] genirq fixup for SGI/SN)
Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging m68knommu/for-next (9720227 m68knommu: clean up linker script)
Merging microblaze/next (8597559 Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (754d5c2 openrisc: Set shortest clock event to 100 ticks)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (f269949 powerpc/perf: Move perf core & PMU code into a subdirectory)
Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging s390/features (486f0b4 [S390] irq: external interrupt code passing)
Merging sparc-next/master (b409650 arch/sparc/kernel/unaligned_64.c: included linux/bitops.h twice)
Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/for-next (83eb26a ceph: ensure prealloc_blob is in place when removing xattr)
Merging cifs/master (4903062 i387: move AMD K7/K8 fpu fxsave/fxrstor workaround from save to restore)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (62aa2b5 Linux 3.3-rc2)
Merging ext4/dev (9ee4930 ext4: format flag in dx_probe())
Merging fuse/for-next (03c9693 cuse: implement memory mapping)
Merging gfs2/master (b3e8048 GFS2: Make bd_cmp() static)
Merging logfs/master (45196ce Merge tag 'usb-3.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging nfs/linux-next (36925a2 Merge branch 'nfs-for-next' into linux-next)
Merging nfsd/nfsd-next (03cfb42 NFSD: Clean up the test_stateid function)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files)
Merging v9fs/for-next (f766619 fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.)
Merging ubifs/linux-next (72d3ef6 UBIFS: do not use inc_link when i_nlink is zero)
Merging xfs/for-next (9006fb9 xfs: split and cleanup xfs_log_reserve)
Merging vfs/for-next (9161999 fs: initial qnx6fs addition)
Merging pci/linux-next (823806f x86/mrst/pci: avoid SoC fixups on non-SoC platforms)
Merging hid/for-next (3f8c853 Merge branch 'upstream' into for-next)
Merging quilt/i2c (c3632e0 i2c-i801: Use usleep_range to wait for command completion)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging quilt/jdelvare-hwmon (0cac3d6 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (76cabfe hwmon: (jc42) Convert to use devm_kzalloc)
Merging quilt/kernel-doc (7e7b32a Update quilt tree location for Documentation/ patches.)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (d345066 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (75cb742 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (96c4d29 pata_legacy: correctly mask recovery field for HT6560B)
Merging infiniband/for-next (22c8bff mlx4_core: Exported functions can't be static)
Merging acpi/next (eb7004e Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release)
Merging ieee1394/for-next (02c68b7 Merge branch 'master' into for-next)
Merging ubi/linux-next (ecaabdb UBI: fix error handling in ubi_scan())
Merging dlm/next (60f98d1 dlm: add recovery callbacks)
Merging scsi/master (50824d6 [SCSI] libsas: async ata-eh)
Merging target-updates/for-next (24d2f08 tcm_fc: Remove cmd->cdb data member)
Merging target-merge/for-next-merge (d65b4e9 Linux 3.3-rc3)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (57872c2 Merge branches 'devel' and 'fixes' into all)
CONFLICT (content): Merge conflict in include/scsi/sas_ata.h
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_port.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_expander.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_event.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
CONFLICT (content): Merge conflict in drivers/scsi/isci/registers.h
Merging slave-dma/next (a1c4601 dmaengine/dw_dmac: Remove unused fields in struct dw_dma_slave)
Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest)
Merging net-next/master (8abe6fb Staging: et131x: unify return value of .ndo_set_mac_address if address is invalid)
Merging wireless-next/master (0a8a721 ath9k: remove unnecessary PS wrappers)
Merging bluetooth/master (52c313c Bluetooth: Add socket error function)
Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged)
Merging l2-mtd/master (783dbd6 sfc: mtd: Use MTD_FAIL_ADDR_UNKNOWN instead of 0xffffffff)
CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c
Merging crypto/master (d97055e Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c
Merging sound/for-next (29402eb Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (baf2e71 Merge branch 'for-3.3' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/codecs/wm5100.c
Merging cpufreq/next (6c523c6 [CPUFREQ] EXYNOS: Removed useless headers and codes)
Merging quilt/rr (42d5bdd virtio: update documentation to v0.9.4 of spec)
Merging input/next (023cea0 Input: tegra-kbc - allow skipping setting up some of GPIO pins)
Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties)
Merging block/for-next (b3021da Merge branch 'for-3.3/core' into for-next)
Merging quilt/device-mapper (6aed107 Commit unwritten data every second to prevent too much building up. In future we might make the commit interval tunable.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent)
Merging mmc/mmc-next (63871af mmc: core: fix regression: set default clock gating delay to 0)
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (96438bc Merge branch 'slub/cleanups' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (2a78e32 commit 56a2559bb654a (md/raid10: recognise replacements ...) changed 'run' to set ->replacement or ->rdev depending on the 'Replacement' status if the device, but it didn't remove the old unconditional setting of 'rdev'.  So it was largely ineffective.)
Merging mfd/for-next (66096cf mfd: Initialize tps65912 irq platform data properly)
Merging drm/drm-next (019d96c drm: add some caps for userspace to discover more info for dumb KMS driver (v2))
Merging fbdev/fbdev-next (94f61a7 i740fb: fix compile error when CONFIG_MTRR is not selected)
Merging viafb/viafb-next (c572c8b viafb: NULL dereference on allocation failure in query_edid())
Merging omap_dss2/for-next (9a90168 OMAPDSS: HDMI: Disable DDC internal pull up)
Merging regulator/for-next (b06300e Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (b0d5de4 IMA: fix audit res field to indicate 1 for success and 0 for failure)
Merging selinux/master (a9ab18a selinux: include flow.h where used rather than get it indirectly)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (1776b7d watchdog: fix error in probe() of s3c2410_wdt (reset at booting))
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (48d2116 Merge branches 'iommu/fixes' and 'arm/tegra' into next)
Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (73c1e20 mm: fix comment typo of truncate_inode_pages_range)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (d57694c PM / Domains: Fix include for PM_GENERIC_DOMAINS=n case)
Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (3db1fe2 Merge branch '3.3-edac-dbam' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (14af60b spi/pl022: Add high priority message pump support)
Merging gpio/gpio/next (daefd89 Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next)
CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h
Merging tip/auto-latest (3292ae0 Merge branch 'x86/x32' into auto-latest)
CONFLICT (content): Merge conflict in include/net/sock.h
Applying: x86: mark X86_X32_ABI broken for now until I get a better binutils
$ git reset --hard HEAD^
Merging refs/next/20120223/tip
Merging rcu/rcu/next (eb7f202 rcu: stop spurious warnings from synchronize_sched_expedited)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (4e44798 perf: perf interface for uprobes)
CONFLICT (content): Merge conflict in tools/perf/util/probe-event.c
CONFLICT (content): Merge conflict in tools/perf/builtin-probe.c
Merging cgroup/for-next (3ce3230 cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (4b99f72 KVM: mmu_notifier: Flush TLBs before releasing mmu_lock)
Merging oprofile/for-next (b9e7f8e Merge branches 'oprofile/urgent' and 'oprofile/core' into oprofile/master)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (f51330a Merge branch 'stable/for-linus-fixes-3.3' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (e920d59 percpu: use raw_local_irq_* in _this_cpu op)
Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e75732 sysctl: Don't call sysctl_follow_link unless we are a link.)
CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c
Merging regmap/for-next (09a3dc8 Merge branch 'regmap-patch' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (8bf1193 intel_idle: Revert change of auto_demotion_disable_flags for Nehalem)
CONFLICT (content): Merge conflict in drivers/base/cpu.c
Merging tty/tty-next (6816383 tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h)
Merging usb/usb-next (c69263c Merge branch 'usb-3.3-rc4' into usb-next)
Merging staging/staging-next (3e80914 Staging: ramster: mark BROKEN)
Merging char-misc/char-misc-next (838d51b char: Fix typo in tlclk.c)
Merging arm-soc/for-next (6ea9f50 Merge branch 'next/devel' into for-next)
CONFLICT (content): Merge conflict in include/linux/virtio_ids.h
Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next)
Applying: mm: frontswap: update for security_vm_enough_memory API change
Merging writeback/writeback-for-next (977b7e3 writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (d67616f Merge branch 'pinctrl-tegra-for-next-diet' into for-next)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base)
Merging kmap_atomic/kmap_atomic (019e9ad feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/staging/zcache/zcache-main.c
CONFLICT (content): Merge conflict in drivers/scsi/storvsc_drv.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/netdev.c
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (b4e5185 irq_domain/x86: Convert x86 (embedded) to use common irq_domain)
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c
CONFLICT (content): Merge conflict in arch/c6x/Kconfig
CONFLICT (content): Merge conflict in arch/arm/common/gic.c
Merging kvmtool/master (52b7a79 kvm tools: Fix "vm setup" help text)
Merging dma-mapping/dma-mapping-next (e972541 common: DMA-mapping: add NON-CONSISTENT attribute)
Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: kmsg_dump: don't run on non-error paths by default
Applying: kprobes: return proper error code from register_kprobe()
Applying: aio: wake up waiters when freeing unused kiocbs
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs
Applying: geos: platform driver for Geos and Geos2 single-board computers
Applying: platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver()
Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
Applying: platform, x86: kill off Moorestown
Applying: intel_scu_ipc: remove Moorestown support
Applying: platform-x86: intel_mid_thermal: add msic_thermal alias
Applying: platform-x86: intel_mid_thermal: convert to use Intel MSIC API
Applying: platform-x86: intel_mid_thermal: turn off thermistor voltage by default
Applying: intel_mid_powerbtn: use MSIC read/write instead of ipc_scu
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: x86, olpc: add debugfs interface for EC commands
Applying: x86, mm: fix the size calculation of mapping tables
Applying: alix2: supplement driver to include GPIO button support
Applying: x86: net5501: platform driver for Soekris Engineering net5501 single-board computer
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: arm: use set_current_blocked() and block_sigmask()
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: fs/btrfs/inode-map.c: fix warnings
Applying: powerpc: use set_current_blocked() and block_sigmask()
Applying: Hexagon: use set_current_blocked() and block_sigmask()
Applying: irqs: fix long-term regression in genirq irq_set_irq_type() handling
Applying: irqs: fix handling of pending IRQs at request time
Applying: softirq: reduce invoke_softirq() code duplication
Applying: tile: use set_current_blocked() and block_sigmask()
Applying: hrtimers: Special-case zero length sleeps
Applying: cs5535-clockevt: don't ignore MFGPT on SMP-capable kernels
Applying: cs5535-clockevt: allow the MFGPT IRQ to be shared
Applying: hpet: factor timer allocate from open
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: drivers/thermal/thermal_sys.c: fix build warning
Applying: thermal_sys: remove unnecessary line continuations
Applying: thermal_sys: remove obfuscating used-once macros
Applying: thermal_sys: kernel style cleanups
Applying: thermal_sys: convert printks to pr_<level>
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: bluetooth: add support for BCM20702A0 [0a5c:21e6]
Applying: debugobjects: Fix selftest for static warnings
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: S390: use block_sigmask()
Applying: xtensa: don't reimplement force_sigsegv()
Applying: xtensa: no need to reset handler if SA_ONESHOT
Applying: xtensa: don't mask signals if we fail to setup signal stack
Applying: xtensa: use set_current_blocked() and block_sigmask()
Applying: slab: introduce kmalloc_array()
Applying: sparc: use block_sigmask()
Applying: mm, oom: avoid looping when chosen thread detaches its mm
Applying: mm, oom: fold oom_kill_task() into oom_kill_process()
Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting
Applying: mm, oom: introduce independent oom killer ratelimit state
Applying: mm: add rss counters consistency check
Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/
Applying: mm: make get_mm_counter static-inline
Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()
Applying: mm: make swapin readahead skip over holes
Applying: make-swapin-readahead-skip-over-holes-fix
Applying: vmscan: reclaim at order 0 when compaction is enabled
Applying: vmscan: kswapd carefully call compaction
Applying: vmscan-kswapd-carefully-call-compaction-fix
Applying: vmscan: only defer compaction for failed order and higher
Applying: compact_pgdat: workaround lockdep warning in kswapd
Applying: mm: compaction: make compact_control order signed
Applying: mm-compaction-make-compact_control-order-signed-fix
Applying: hugetlbfs: fix hugetlb_get_unmapped_area()
Applying: hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown()
Applying: hugetlb: try to search again if it is really needed
Applying: hugetlb-try-to-search-again-if-it-is-really-needed-fix
Applying: mm: do not reset cached_hole_size when vma is unmapped
Applying: mm: search from free_area_cache for the bigger size
Applying: pagemap: avoid splitting thp when reading /proc/pid/pagemap
Applying: thp: optimize away unnecessary page table locking
Applying: pagemap: export KPF_THP
Applying: pagemap: document KPF_THP and make page-types aware of it
Applying: pagemap: introduce data structure for pagemap entry
Applying: mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
Applying: mm: vmscan: forcibly scan highmem if there are too many buffer_heads pinning highmem
Applying: mm: hugetlb: defer freeing pages when gathering surplus pages
Applying: mm: replace COMPACTION_BUILD with IS_ENABLED(CONFIG_COMPACTION)
Applying: mm-replace-compaction_build-with-is_enabledconfig_compaction-fix
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: replace MEM_CONT by MEM_RES_CTLR
Applying: memcg: replace mem and mem_cont stragglers
Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT
Applying: memcg: enum lru_list lru
Applying: memcg: remove redundant returns
Applying: memcg: remove unnecessary thp check in page stat accounting
Applying: idr: make idr_get_next() good for rcu_read_lock()
Applying: cgroup: revert ss_id_lock to spinlock
Applying: memcg: let css_get_next() rely upon rcu_read_lock()
Applying: memcg: remove PCG_CACHE page_cgroup flag
Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes
Applying: memcg: kill dead prev_priority stubs
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: sh: no need to reset handler if SA_ONESHOT
Applying: sh: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: alpha: use set_current_blocked() and block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: C6X: use set_current_blocked() and block_sigmask()
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: um: don't restore current->blocked on error
Applying: um: use set_current_blocked() and block_sigmask()
Applying: magic.h: move some FS magic numbers into magic.h
Applying: nmi watchdog: do not use cpp symbol in Kconfig
Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix
Applying: kernel/exit.c: if init dies, log a signal which killed it, if any
Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix
Applying: posix_types: make __kernel_[ug]id32_t default to unsigned int
Applying: posix_types: make it possible to override __kernel_fsid_t
Applying: alpha: use generic posix_types.h
Applying: arm: use generic posix_types.h
Applying: avr32: use generic posix_types.h
Applying: cris: use generic posix_types.h
Applying: frv: use generic posix_types.h
Applying: h8300: use generic posix_types.h
Applying: ia64: use generic posix_types.h
Applying: m32r: use generic posix_types.h
Applying: m68k: use generic posix_types.h
Applying: mips: use generic posix_types.h
Applying: mn10300: use generic posix_types.h
Applying: parisc: use generic posix_types.h
Applying: powerpc: use generic posix_types.h
Applying: s390: use generic posix_types.h
Applying: sh: remove unnecessary posix_types.h type overrides
Applying: sparc: use generic posix_types.h
Applying: x86: use generic posix_types.h
Applying: xtensa: use generic posix_types.h
Applying: posix_types: remove fd_set macros
Applying: posix_types-remove-fd_set-macros-checkpatch-fixes
Applying: vfs: increment iversion when a file is truncated
Applying: brlocks/lglocks: cleanups
Applying: brlocks-lglocks-cleanups-checkpatch-fixes
Applying: vfs: correctly set the dir i_mutex lockdep class
Applying: seq_file: fix mishandling of consecutive pread() invocations.
Applying: MAINTAINERS: fix REMOTEPROC F: typo
Applying: MAINTAINERS: Update MCA section
Applying: MAINTAINERS: update git urls for 2.6 deletions
Applying: backlight: convert backlight i2c drivers to module_i2c_driver
Applying: backlight: convert backlight spi drivers to module_spi_driver
Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions
Applying: drivers/video/backlight: use devm_ functions
Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions
Applying: backlight: new backlight driver for LP855x devices
Applying: backlight: lp855x_bl: Add missing mutex_unlock in lp855x_read_byte error path
Applying: backlight/lp855x_bl.c: check platform data in lp855x_probe()
Applying: backlight/lp855x_bl.c: small cleanups
Applying: backlight: add driver for Bachmann's ot200
Applying: backlight-add-driver-for-bachmanns-ot200-fix
Applying: backlight: add support for Pandora backlight
Applying: backlight-add-support-for-pandora-backlight-v2
Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function
Applying: bitops: remove for_each_set_bit_cont()
Applying: bitops: introduce for_each_clear_bit()
Applying: mtd: use for_each_clear_bit()
Applying: s390/char: use for_each_clear_bit()
Applying: uwb: use for_each_clear_bit()
Applying: x86: use for_each_clear_bit_from()
Applying: drivers/leds/leds-lp5521.c: fix typo
Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()
Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config
Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data
Applying: drivers/leds/leds-lp5521.c: support led pattern data
Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes
Applying: drivers/leds/leds-lp5521.c: redefinition of register bits
Applying: drivers/leds/leds-lp5523.c: constify some data
Applying: drivers/leds: add driver for PCA9633 I2C chip
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix-2
Applying: drivers/leds/leds-gpio.c: use linux/gpio.h rather than asm/gpio.h
Applying: leds-lm3530: set the max_brightness to 127
Applying: leds-lm3530: replace i2c_client with led_classdev
Applying: leds-lm3530-replace-i2c_client-with-led_classdev-fix
Applying: leds-lm3530: support pwm input mode
Applying: leds-lm3530: remove LM3530_ALS_ZONE_REG code
Applying: leds-lm3530: replace pltfm with pdata
Applying: drivers/leds/leds-pca9633.c: remove unused 'adapter' variable
Applying: drivers/leds/leds-lm3530.c: move the code setting gen_config to one place
Applying: drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place-fix
Applying: string: memchr_inv speed improvements
Applying: prio_tree: remove unnecessary code in prio_tree_replace
Applying: prio_tree: cleanup prio_tree_left()/prio_tree_right()
Applying: prio_tree: simplify prio_tree_expand()
Applying: prio_tree: introduce prio_set_parent()
Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
Applying: crc32: remove two instances of trailing whitespaces
Applying: crc32: move long comment about crc32 fundamentals to Documentation/
Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix
Applying: crc32: simplify unit test code
Applying: crc32: miscellaneous cleanups
Applying: crc32: fix mixing of endian-specific types
Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts
Applying: crc32: add slice-by-8 algorithm to existing code
Applying: crc32: optimize loop counter for x86
Applying: crc32: add note about this patchset to crc32.c
Applying: crc32: bolt on crc32c
Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode
Applying: crypto: crc32c should use library implementation
Applying: crc32: add self-test code for crc32c
Applying: crc32: select an algorithm via Kconfig
Applying: epoll: comment the funky #ifdef
Applying: init/do_mounts.c: create /root if it does not exist
Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt
Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors
Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device
Applying: rtc: convert rtc spi drivers to module_spi_driver
Applying: rtc: convert rtc i2c drivers to module_i2c_driver
Applying: MIPS: add RTC support for loongson1B
Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access
Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state
Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing
Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR
Applying: drivers/rtc: remove IRQF_DISABLED
Applying: drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static
Applying: drivers/rtc/rtc-max8925.c: fix max8925_rtc_read_alarm() return value error
Applying: drivers/rtc/rtc-max8925.c: fix alarm->enabled mistake in max8925_rtc_read_alarm/max8925_rtc_set_alarm
Applying: rtc: driver for DA9052/53 PMIC v1
Applying: rtc-rtc-driver-for-da9052-53-pmic-v1-fix
Applying: ptrace: the killed tracee should not enter the syscall
Applying: ptrace: don't send SIGTRAP on exec if SEIZED
Applying: ptrace: don't modify flags on PTRACE_SETOPTIONS failure
Applying: ptrace: simplify PTRACE_foo constants and PTRACE_SETOPTIONS code
Applying: ptrace: make PTRACE_SEIZE set ptrace options specified in 'data' parameter
Applying: ptrace: renumber PTRACE_EVENT_STOP so that future new options and events can match
Applying: ptrace: remove PTRACE_SEIZE_DEVEL bit
Applying: signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE
Applying: signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths
Applying: signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()
Applying: signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/
Applying: usermodehelper: use UMH_WAIT_PROC consistently
Applying: usermodehelper: introduce umh_complete(sub_info)
Applying: usermodehelper: implement UMH_KILLABLE
Applying: usermodehelper: kill umh_wait, renumber UMH_* constants
Applying: usermodehelper: ____call_usermodehelper() doesn't need do_exit()
Applying: kmod: introduce call_modprobe() helper
Applying: kmod: make __request_module() killable
Applying: kmod: avoid deadlock from recursive kmod call
Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix
Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static
Applying: proc: speedup /proc/stat handling
Applying: procfs: add num_to_str() to speed up /proc/stat
Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix
Applying: procfs: avoid breaking the ABI in /proc/stat
Applying: procfs: speed up /proc/pid/stat, statm
Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes
Applying: proc: clean up /proc/<pid>/environ handling
Applying: seq_file: add seq_set_overflow(), seq_overflow()
Applying: seq_file-add-seq_set_overflow-seq_overflow-fix
Applying: smp: introduce a generic on_each_cpu_mask() function
Applying: arm: move arm over to generic on_each_cpu_mask
Applying: tile: move tile to use generic on_each_cpu_mask
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix
Applying: slub: only IPI CPUs that have per cpu obj to flush
Applying: fs: only send IPI to invalidate LRU BH when needed
Applying: mm: only IPI CPUs to drain local pages if they exist
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-v9
Applying: lib/cpumask.c: remove __any_online_cpu()
Applying: arch/ia64: remove references to cpu_*_map
Applying: cpumask: avoid mask based num_possible_cpus() and num_online_cpus()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc: provide generic compat versions of IPC syscalls
Applying: ipmi: decrease the IPMI message transaction time in interrupt mode
Applying: ipmi: increase KCS timeouts
Applying: ipmi: use a tasklet for handling received messages
Applying: ipmi: fix message handling during panics
Applying: ipmi: simplify locking
Applying: ipmi: use locks on watchdog timeout set on reboot
Applying: sysctl: use bitmap library functions
Applying: pidns: add reboot_pid_ns() to handle the reboot syscall
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes
Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
Applying: selftests: launch individual selftests from the main Makefile
Applying: selftests/Makefile: make `run_tests' depend on `all'
Applying: mm: move page-types.c from Documentation to tools/vm
Applying: mm: move slabinfo.c to tools/vm
Applying: mm: move hugepage test examples to tools/testing/selftests/vm
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix
Applying: powerpc: use generic posix_types.h fix
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2
Merging akpm (2a1a08b syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2)
Applying: percpu: fixup for added percpu_xxx calls in i387.h
[master 5f9dc4d] Revert "posix_types-remove-fd_set-macros-checkpatch-fixes"
[master 777dfdf] Revert "posix_types: remove fd_set macros"

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-25 23:49   ` Stephen Rothwell
@ 2008-02-26  7:55     ` Geert Uytterhoeven
  0 siblings, 0 replies; 30+ messages in thread
From: Geert Uytterhoeven @ 2008-02-26  7:55 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML, Linux/m68k

On Tue, 26 Feb 2008, Stephen Rothwell wrote:
> On Mon, 25 Feb 2008 22:56:04 +0100 (CET) Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >
> > Can you please add
> > http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/series?
> > So far there's only one patch in between NEXT_PATCHES_{START,END} yet,
> > though.
> 
> Added, thanks.
> 
> > Ah, I see the m68k cross-compiler is still missing? ;-)
> 
> Please look again :-)  Are there any particular configs we should build?

Great!

I really should update the defconfigs, and add a `defconfig_all' which
builds a kernel for all platforms (except Sun-3).

For now defconfig is OK, I think.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-25 21:56 ` Geert Uytterhoeven
  2008-02-25 22:30   ` Randy Dunlap
@ 2008-02-25 23:49   ` Stephen Rothwell
  2008-02-26  7:55     ` Geert Uytterhoeven
  1 sibling, 1 reply; 30+ messages in thread
From: Stephen Rothwell @ 2008-02-25 23:49 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: linux-next, LKML, Linux/m68k

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

Hi Geert,

On Mon, 25 Feb 2008 22:56:04 +0100 (CET) Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Can you please add
> http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/series?
> So far there's only one patch in between NEXT_PATCHES_{START,END} yet,
> though.

Added, thanks.

> Ah, I see the m68k cross-compiler is still missing? ;-)

Please look again :-)  Are there any particular configs we should build?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-25 21:56 ` Geert Uytterhoeven
@ 2008-02-25 22:30   ` Randy Dunlap
  2008-02-25 23:49   ` Stephen Rothwell
  1 sibling, 0 replies; 30+ messages in thread
From: Randy Dunlap @ 2008-02-25 22:30 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: Stephen Rothwell, linux-next, LKML, Linux/m68k

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

On Mon, 25 Feb 2008 22:56:04 +0100 (CET) Geert Uytterhoeven wrote:

> P.S. For the interested, a script to update the SHA1 in the quilt series file:

Thanks, anakin.
Version to update $BASE based on current kernel tree is attached.

---
~Randy

[-- Attachment #2: quilt-update-tree-base --]
[-- Type: application/octet-stream, Size: 818 bytes --]

#!/bin/bash
series=patches/series

get_kversion() {
head -4 Makefile | sed -e 's/ //g' > /tmp/.kversion.$$
. /tmp/.kversion.$$
rm /tmp/.kversion.$$

case "$EXTRAVERSION" in
	"")
		;;
	*-mm*)
		EXTRAVERSION=$(echo "$EXTRAVERSION" | sed -e 's/\(.*\)-mm[0-9]*/\1/')
		;;
	*-kj*)
		EXTRAVERSION=$(echo "$EXTRAVERSION" | sed -e 's/\(.*\)-kj[0-9]*/\1/')
		;;
	-*)
		;;
	*)
		EXTRAVERSION="-$EXTRAVERSION";;
esac
kversion=$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION
if [ "$kversion" = ".." ]
then
	kversion=$(basename $(/bin/pwd))
fi
echo $kversion
}

if [ ! -f $series ]; then
    echo Cannot find $series
    exit 1
fi

ver=`get_kversion`
if [ -n "$ver" ]; then
    if grep '^# BASE' $series > /dev/null; then
	sed -i -e "s/^# BASE.*$/# BASE $ver/" $series
	echo Updated BASE to $ver
    else
	echo No BASE found
    fi
fi

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-24  5:23 Stephen Rothwell
  2008-02-24 18:19 ` Kevin Winchester
@ 2008-02-25 21:56 ` Geert Uytterhoeven
  2008-02-25 22:30   ` Randy Dunlap
  2008-02-25 23:49   ` Stephen Rothwell
  1 sibling, 2 replies; 30+ messages in thread
From: Geert Uytterhoeven @ 2008-02-25 21:56 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML, Linux/m68k

On Sun, 24 Feb 2008, Stephen Rothwell wrote:
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> 
> 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
> allmodconfig for both powerpc and x86_64.
> 
> There only one minor merge problem and a few build failures (the two in
> Linus' tree have been fixed and the other reported).
> 
> We are up to 32 trees, more are welcome (even if they are currently
> empty).

Can you please add
http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/series?
So far there's only one patch in between NEXT_PATCHES_{START,END} yet,
though.

> Status of my local build tests is at
> http://kisskb.ellerman.id.au/kisskb/branch/9/.

Ah, I see the m68k cross-compiler is still missing? ;-)

Gr{oetje,eeting}s,

						Geert

P.S. For the interested, a script to update the SHA1 in the quilt series file:

anakin$ cat $(type -p quilt-update-git-base)
#!/bin/bash
series=patches/series

if [ ! -f $series ]; then
    echo Cannot find $series
    exit 1
fi

if head=$(git rev-parse --verify HEAD); then
    if grep '^# BASE' $series > /dev/null; then
	sed -i -e "s/^# BASE.*$/# BASE $head/" $series
	echo Updated BASE to $head
    else
	echo No BASE found
    fi
fi
anakin$ 

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-24 23:35     ` Kevin Winchester
  2008-02-24 23:43       ` Rafael J. Wysocki
@ 2008-02-25  9:26       ` Pavel Machek
  1 sibling, 0 replies; 30+ messages in thread
From: Pavel Machek @ 2008-02-25  9:26 UTC (permalink / raw)
  To: Kevin Winchester
  Cc: Rafael J. Wysocki, Stephen Rothwell, linux-next, LKML, len.brown,
	linux-pm, Ingo Molnar, peterz

Hi!

> > velocity_suspend() seems to be at fault.
> 
> (gdb) l *(velocity_suspend+0x37)
> 0xc0244665 is in velocity_suspend (drivers/net/via-velocity.c:3399).
> 3394		if(!netif_running(vptr->dev))
> 3395			return 0;
> 3396	
> 3397		netif_device_detach(vptr->dev);
> 3398	
> 3399		spin_lock_irqsave(&vptr->lock, flags);
> 3400		pci_save_state(pdev);
> 3401	#ifdef ETHTOOL_GWOL
> 3402		if (vptr->flags & VELOCITY_FLAGS_WOL_ENABLED) {
> 3403			velocity_get_ip(vptr);
> (gdb) 
> 3404			velocity_save_context(vptr, &vptr->context);
> 3405			velocity_shutdown(vptr);
> 3406			velocity_set_wol(vptr);
> 3407			pci_enable_wake(pdev, PCI_D3hot, 1);
> 3408			pci_set_power_state(pdev, PCI_D3hot);
> 3409		} else {
> 3410			velocity_save_context(vptr, &vptr->context);
> 3411			velocity_shutdown(vptr);
> 3412			pci_disable_device(pdev);
> 3413			pci_set_power_state(pdev, pci_choose_state(pdev, state));
> (gdb) 
> 3414		}
> 3415	#else
> 3416		pci_set_power_state(pdev, pci_choose_state(pdev, state));
> 3417	#endif
> 3418		spin_unlock_irqrestore(&vptr->lock, flags);
> 3419		return 0;
> 3420	}
> 
> So velocity_suspend calls spin_lock_irqsave, and then pci_set_power_state which msleep()s.  Is that the root problem here? (I've added Ingo & Peter to the CC list since they may have some comments on the scheduler/lockdep parts of the trace).

Looks like velocity is broken. Can you try to unload it before sleep
to see if the rest of suspend works for you?

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-24 23:43       ` Rafael J. Wysocki
@ 2008-02-25  0:23         ` Kevin Winchester
  0 siblings, 0 replies; 30+ messages in thread
From: Kevin Winchester @ 2008-02-25  0:23 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Stephen Rothwell, linux-next, LKML, len.brown, pavel, linux-pm,
	Ingo Molnar, peterz, romieu, NetDev

Rafael J. Wysocki wrote:
> On Monday, 25 of February 2008, Kevin Winchester wrote:
>> Rafael J. Wysocki wrote:
>>> On Sunday, 24 of February 2008, Kevin Winchester wrote:
>>>
>>>> Today was different - I attempted to suspend and resume from the console,
>>>> and the machine did not come back up.  I found the following in my log -
>>>> any help would be appreciated.
>>>>
>>>> Feb 24 13:59:56 alekhine kernel: [  456.497875] PM: Syncing filesystems ... done.
>>>> Feb 24 14:00:20 alekhine kernel: [  456.507273] Freezing user space processes ... (elapsed 0.00 seconds) done.
>>>> Feb 24 14:00:20 alekhine kernel: [  456.510447] Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done.
>>>> Feb 24 14:00:20 alekhine kernel: [  456.510754] ACPI: Preparing to enter system sleep state S3
>>>> Feb 24 14:00:20 alekhine kernel: [  456.612370] Suspending console(s)
>>>> Feb 24 14:00:20 alekhine kernel: [  456.616254] sd 3:0:0:0: [sda] Synchronizing SCSI cache
>>>> Feb 24 14:00:20 alekhine kernel: [  456.616521] sd 3:0:0:0: [sda] Stopping disk
>>>> Feb 24 14:00:20 alekhine kernel: [  456.618221] ACPI: PCI interrupt for device 0000:00:11.5 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.630296] ACPI: PCI interrupt for device 0000:00:10.4 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.641085] ACPI: PCI interrupt for device 0000:00:10.3 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.651877] ACPI: PCI interrupt for device 0000:00:10.2 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.662716] ACPI: PCI interrupt for device 0000:00:10.1 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.673550] ACPI: PCI interrupt for device 0000:00:10.0 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.684385] ACPI: PCI interrupt for device 0000:00:0f.1 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.695056] ACPI: PCI interrupt for device 0000:00:0f.0 disabled
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856] 5 locks held by bash/2929:
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856] irq event stamp: 19374
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01177c7>] __schedule_bug+0x58/0x5f
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0325b43>] schedule+0x67/0x3b3
>>> Well, could you check what's at schedule+0x67, please?
>> Is this how I would do this?  I tried schedule+0x67, but it just showed me the beginning of profile_hit.
>>
>> (gdb) l *(schedule+0x66)
>> 0xc0325b42 is in schedule (kernel/sched.c:3836).
>> 3831		 * Test if we are atomic. Since do_exit() needs to call into
>> 3832		 * schedule() atomically, we ignore that path for now.
>> 3833		 * Otherwise, whine if we are scheduling when we should not be.
>> 3834		 */
>> 3835		if (unlikely(in_atomic_preempt_off()) && unlikely(!prev->exit_state))
>> 3836			__schedule_bug(prev);
>> 3837	
>> 3838		profile_hit(SCHED_PROFILING, __builtin_return_address(0));
>> 3839	
>> 3840		schedstat_inc(this_rq(), sched_count);
>>
>> It appears that we are scheduling when we should not be...
>>
>>
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c39>] ? __mod_timer+0x8d/0x98
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326043>] schedule_timeout+0x73/0x91
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c012185c>] ? process_timeout+0x0/0xa
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c54>] msleep+0x10/0x16
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
>>>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0244917>] velocity_suspend+0x2e9/0x302
>>> velocity_suspend() seems to be at fault.
>> (gdb) l *(velocity_suspend+0x37)
>> 0xc0244665 is in velocity_suspend (drivers/net/via-velocity.c:3399).
>> 3394		if(!netif_running(vptr->dev))
>> 3395			return 0;
>> 3396	
>> 3397		netif_device_detach(vptr->dev);
>> 3398	
>> 3399		spin_lock_irqsave(&vptr->lock, flags);
>> 3400		pci_save_state(pdev);
>> 3401	#ifdef ETHTOOL_GWOL
>> 3402		if (vptr->flags & VELOCITY_FLAGS_WOL_ENABLED) {
>> 3403			velocity_get_ip(vptr);
>> (gdb) 
>> 3404			velocity_save_context(vptr, &vptr->context);
>> 3405			velocity_shutdown(vptr);
>> 3406			velocity_set_wol(vptr);
>> 3407			pci_enable_wake(pdev, PCI_D3hot, 1);
>> 3408			pci_set_power_state(pdev, PCI_D3hot);
> 
> Hm, why doesn't it use pci_choose_state() here?
> 
>> 3409		} else {
>> 3410			velocity_save_context(vptr, &vptr->context);
>> 3411			velocity_shutdown(vptr);
>> 3412			pci_disable_device(pdev);
>> 3413			pci_set_power_state(pdev, pci_choose_state(pdev, state));
>> (gdb) 
>> 3414		}
>> 3415	#else
>> 3416		pci_set_power_state(pdev, pci_choose_state(pdev, state));
>> 3417	#endif
>> 3418		spin_unlock_irqrestore(&vptr->lock, flags);
>> 3419		return 0;
>> 3420	}
>>
>> So velocity_suspend calls spin_lock_irqsave, and then pci_set_power_state
>> which msleep()s.  Is that the root problem here?
> 
> Yes, most probably, it is.
> 
>> (I've added Ingo & Peter to the CC list since they may have some comments on
>> the scheduler/lockdep parts of the trace).   
> 
> Well, it calls many things it shouldn't call under a spinlock, AFAICS.
> 
> Who's maintaining this driver?
> 

Added:

VIA VELOCITY NETWORK DRIVER
P:      Francois Romieu
M:      romieu@fr.zoreil.com
L:      netdev@vger.kernel.org
S:      Maintained




^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-24 23:35     ` Kevin Winchester
@ 2008-02-24 23:43       ` Rafael J. Wysocki
  2008-02-25  0:23         ` Kevin Winchester
  2008-02-25  9:26       ` Pavel Machek
  1 sibling, 1 reply; 30+ messages in thread
From: Rafael J. Wysocki @ 2008-02-24 23:43 UTC (permalink / raw)
  To: Kevin Winchester
  Cc: Stephen Rothwell, linux-next, LKML, len.brown, pavel, linux-pm,
	Ingo Molnar, peterz

On Monday, 25 of February 2008, Kevin Winchester wrote:
> Rafael J. Wysocki wrote:
> > On Sunday, 24 of February 2008, Kevin Winchester wrote:
> > 
> >> Today was different - I attempted to suspend and resume from the console,
> >> and the machine did not come back up.  I found the following in my log -
> >> any help would be appreciated.
> >>
> >> Feb 24 13:59:56 alekhine kernel: [  456.497875] PM: Syncing filesystems ... done.
> >> Feb 24 14:00:20 alekhine kernel: [  456.507273] Freezing user space processes ... (elapsed 0.00 seconds) done.
> >> Feb 24 14:00:20 alekhine kernel: [  456.510447] Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done.
> >> Feb 24 14:00:20 alekhine kernel: [  456.510754] ACPI: Preparing to enter system sleep state S3
> >> Feb 24 14:00:20 alekhine kernel: [  456.612370] Suspending console(s)
> >> Feb 24 14:00:20 alekhine kernel: [  456.616254] sd 3:0:0:0: [sda] Synchronizing SCSI cache
> >> Feb 24 14:00:20 alekhine kernel: [  456.616521] sd 3:0:0:0: [sda] Stopping disk
> >> Feb 24 14:00:20 alekhine kernel: [  456.618221] ACPI: PCI interrupt for device 0000:00:11.5 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.630296] ACPI: PCI interrupt for device 0000:00:10.4 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.641085] ACPI: PCI interrupt for device 0000:00:10.3 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.651877] ACPI: PCI interrupt for device 0000:00:10.2 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.662716] ACPI: PCI interrupt for device 0000:00:10.1 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.673550] ACPI: PCI interrupt for device 0000:00:10.0 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.684385] ACPI: PCI interrupt for device 0000:00:0f.1 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.695056] ACPI: PCI interrupt for device 0000:00:0f.0 disabled
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856] 5 locks held by bash/2929:
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856] irq event stamp: 19374
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01177c7>] __schedule_bug+0x58/0x5f
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0325b43>] schedule+0x67/0x3b3
> > 
> > Well, could you check what's at schedule+0x67, please?
> 
> Is this how I would do this?  I tried schedule+0x67, but it just showed me the beginning of profile_hit.
> 
> (gdb) l *(schedule+0x66)
> 0xc0325b42 is in schedule (kernel/sched.c:3836).
> 3831		 * Test if we are atomic. Since do_exit() needs to call into
> 3832		 * schedule() atomically, we ignore that path for now.
> 3833		 * Otherwise, whine if we are scheduling when we should not be.
> 3834		 */
> 3835		if (unlikely(in_atomic_preempt_off()) && unlikely(!prev->exit_state))
> 3836			__schedule_bug(prev);
> 3837	
> 3838		profile_hit(SCHED_PROFILING, __builtin_return_address(0));
> 3839	
> 3840		schedstat_inc(this_rq(), sched_count);
> 
> It appears that we are scheduling when we should not be...
> 
> 
> > 
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c39>] ? __mod_timer+0x8d/0x98
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326043>] schedule_timeout+0x73/0x91
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c012185c>] ? process_timeout+0x0/0xa
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c54>] msleep+0x10/0x16
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
> >> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0244917>] velocity_suspend+0x2e9/0x302
> > 
> > velocity_suspend() seems to be at fault.
> 
> (gdb) l *(velocity_suspend+0x37)
> 0xc0244665 is in velocity_suspend (drivers/net/via-velocity.c:3399).
> 3394		if(!netif_running(vptr->dev))
> 3395			return 0;
> 3396	
> 3397		netif_device_detach(vptr->dev);
> 3398	
> 3399		spin_lock_irqsave(&vptr->lock, flags);
> 3400		pci_save_state(pdev);
> 3401	#ifdef ETHTOOL_GWOL
> 3402		if (vptr->flags & VELOCITY_FLAGS_WOL_ENABLED) {
> 3403			velocity_get_ip(vptr);
> (gdb) 
> 3404			velocity_save_context(vptr, &vptr->context);
> 3405			velocity_shutdown(vptr);
> 3406			velocity_set_wol(vptr);
> 3407			pci_enable_wake(pdev, PCI_D3hot, 1);
> 3408			pci_set_power_state(pdev, PCI_D3hot);

Hm, why doesn't it use pci_choose_state() here?

> 3409		} else {
> 3410			velocity_save_context(vptr, &vptr->context);
> 3411			velocity_shutdown(vptr);
> 3412			pci_disable_device(pdev);
> 3413			pci_set_power_state(pdev, pci_choose_state(pdev, state));
> (gdb) 
> 3414		}
> 3415	#else
> 3416		pci_set_power_state(pdev, pci_choose_state(pdev, state));
> 3417	#endif
> 3418		spin_unlock_irqrestore(&vptr->lock, flags);
> 3419		return 0;
> 3420	}
> 
> So velocity_suspend calls spin_lock_irqsave, and then pci_set_power_state
> which msleep()s.  Is that the root problem here?

Yes, most probably, it is.

> (I've added Ingo & Peter to the CC list since they may have some comments on
> the scheduler/lockdep parts of the trace).   

Well, it calls many things it shouldn't call under a spinlock, AFAICS.

Who's maintaining this driver?

Rafael

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-24 20:00   ` Rafael J. Wysocki
@ 2008-02-24 23:35     ` Kevin Winchester
  2008-02-24 23:43       ` Rafael J. Wysocki
  2008-02-25  9:26       ` Pavel Machek
  0 siblings, 2 replies; 30+ messages in thread
From: Kevin Winchester @ 2008-02-24 23:35 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Stephen Rothwell, linux-next, LKML, len.brown, pavel, linux-pm,
	Ingo Molnar, peterz

Rafael J. Wysocki wrote:
> On Sunday, 24 of February 2008, Kevin Winchester wrote:
> 
>> Today was different - I attempted to suspend and resume from the console,
>> and the machine did not come back up.  I found the following in my log -
>> any help would be appreciated.
>>
>> Feb 24 13:59:56 alekhine kernel: [  456.497875] PM: Syncing filesystems ... done.
>> Feb 24 14:00:20 alekhine kernel: [  456.507273] Freezing user space processes ... (elapsed 0.00 seconds) done.
>> Feb 24 14:00:20 alekhine kernel: [  456.510447] Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done.
>> Feb 24 14:00:20 alekhine kernel: [  456.510754] ACPI: Preparing to enter system sleep state S3
>> Feb 24 14:00:20 alekhine kernel: [  456.612370] Suspending console(s)
>> Feb 24 14:00:20 alekhine kernel: [  456.616254] sd 3:0:0:0: [sda] Synchronizing SCSI cache
>> Feb 24 14:00:20 alekhine kernel: [  456.616521] sd 3:0:0:0: [sda] Stopping disk
>> Feb 24 14:00:20 alekhine kernel: [  456.618221] ACPI: PCI interrupt for device 0000:00:11.5 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.630296] ACPI: PCI interrupt for device 0000:00:10.4 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.641085] ACPI: PCI interrupt for device 0000:00:10.3 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.651877] ACPI: PCI interrupt for device 0000:00:10.2 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.662716] ACPI: PCI interrupt for device 0000:00:10.1 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.673550] ACPI: PCI interrupt for device 0000:00:10.0 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.684385] ACPI: PCI interrupt for device 0000:00:0f.1 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.695056] ACPI: PCI interrupt for device 0000:00:0f.0 disabled
>> Feb 24 14:00:20 alekhine kernel: [  456.705856] 5 locks held by bash/2929:
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
>> Feb 24 14:00:20 alekhine kernel: [  456.705856] irq event stamp: 19374
>> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
>> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
>> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
>> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
>> Feb 24 14:00:20 alekhine kernel: [  456.705856] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01177c7>] __schedule_bug+0x58/0x5f
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0325b43>] schedule+0x67/0x3b3
> 
> Well, could you check what's at schedule+0x67, please?

Is this how I would do this?  I tried schedule+0x67, but it just showed me the beginning of profile_hit.

(gdb) l *(schedule+0x66)
0xc0325b42 is in schedule (kernel/sched.c:3836).
3831		 * Test if we are atomic. Since do_exit() needs to call into
3832		 * schedule() atomically, we ignore that path for now.
3833		 * Otherwise, whine if we are scheduling when we should not be.
3834		 */
3835		if (unlikely(in_atomic_preempt_off()) && unlikely(!prev->exit_state))
3836			__schedule_bug(prev);
3837	
3838		profile_hit(SCHED_PROFILING, __builtin_return_address(0));
3839	
3840		schedstat_inc(this_rq(), sched_count);

It appears that we are scheduling when we should not be...


> 
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c39>] ? __mod_timer+0x8d/0x98
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326043>] schedule_timeout+0x73/0x91
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c012185c>] ? process_timeout+0x0/0xa
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c54>] msleep+0x10/0x16
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0244917>] velocity_suspend+0x2e9/0x302
> 
> velocity_suspend() seems to be at fault.

(gdb) l *(velocity_suspend+0x37)
0xc0244665 is in velocity_suspend (drivers/net/via-velocity.c:3399).
3394		if(!netif_running(vptr->dev))
3395			return 0;
3396	
3397		netif_device_detach(vptr->dev);
3398	
3399		spin_lock_irqsave(&vptr->lock, flags);
3400		pci_save_state(pdev);
3401	#ifdef ETHTOOL_GWOL
3402		if (vptr->flags & VELOCITY_FLAGS_WOL_ENABLED) {
3403			velocity_get_ip(vptr);
(gdb) 
3404			velocity_save_context(vptr, &vptr->context);
3405			velocity_shutdown(vptr);
3406			velocity_set_wol(vptr);
3407			pci_enable_wake(pdev, PCI_D3hot, 1);
3408			pci_set_power_state(pdev, PCI_D3hot);
3409		} else {
3410			velocity_save_context(vptr, &vptr->context);
3411			velocity_shutdown(vptr);
3412			pci_disable_device(pdev);
3413			pci_set_power_state(pdev, pci_choose_state(pdev, state));
(gdb) 
3414		}
3415	#else
3416		pci_set_power_state(pdev, pci_choose_state(pdev, state));
3417	#endif
3418		spin_unlock_irqrestore(&vptr->lock, flags);
3419		return 0;
3420	}

So velocity_suspend calls spin_lock_irqsave, and then pci_set_power_state which msleep()s.  Is that the root problem here? (I've added Ingo & Peter to the CC list since they may have some comments on the scheduler/lockdep parts of the trace).

> 
> At the moment I have to take care of some more urgent things, I'll have a look
> at it tomorrow.
> 
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0133854>] ? mark_held_locks+0x4e/0x66
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326664>] ? __mutex_unlock_slowpath+0xd5/0xef
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01339dd>] ? trace_hardirqs_on+0xe5/0x120
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e249e>] pci_device_suspend+0x1b/0x4b
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c023c625>] device_suspend+0x192/0x251
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138a7a>] suspend_devices_and_enter+0x3d/0xe0
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138c1c>] enter_state+0xb2/0x100
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138cfe>] state_store+0x94/0xac
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138c6a>] ? state_store+0x0/0xac
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01d50c5>] kobj_attr_store+0x1a/0x22
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c018969f>] sysfs_write_file+0xb8/0xe3
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01895e7>] ? sysfs_write_file+0x0/0xe3
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01597d7>] vfs_write+0x88/0xf8
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0159c6e>] sys_write+0x3b/0x60
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0102bfa>] sysenter_past_esp+0x5f/0xa5
>> Feb 24 14:00:20 alekhine kernel: [  456.705856]  =======================
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] 
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] =================================
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] [ INFO: inconsistent lock state ]
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] 2.6.25-rc2-next-20080224 #58
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] ---------------------------------
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] inconsistent {in-hardirq-W} -> {hardirq-on-W} usage.
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] bash/2929 [HC0[0]:SC0[0]:HE1:SE1] takes:
>> Feb 24 14:00:20 alekhine kernel: [  456.716732]  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
>> Feb 24 14:00:20 alekhine kernel: [  456.716732] {in-hardirq-W} state was registered at:
>> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c013416b>] __lock_acquire+0x3ac/0xb43
>> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0134963>] lock_acquire+0x61/0x7d
>> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0243940>] velocity_intr+0x24/0x579
>> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c03279fb>] _spin_lock+0x23/0x32
>> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0243940>] velocity_intr+0x24/0x579
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c0243940>] velocity_intr+0x24/0x579
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c02ca5e1>] snd_via8233_interrupt+0xdc/0xe7
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a884>] handle_fasteoi_irq+0x95/0xab
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c01398b3>] handle_IRQ_event+0x1a/0x46
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a88d>] handle_fasteoi_irq+0x9e/0xab
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a7ef>] handle_fasteoi_irq+0x0/0xab
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c0105010>] do_IRQ+0xab/0xd4
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<ffffffff>] 0xffffffff
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] irq event stamp: 19374
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] 
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] other info that might help us debug this:
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] 5 locks held by bash/2929:
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] 
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] stack backtrace:
>> Feb 24 14:00:20 alekhine kernel: [  456.716733] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0132d3b>] print_usage_bug+0x10d/0x11a
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c013361f>] mark_lock+0x1f1/0x3d8
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0133854>] mark_held_locks+0x4e/0x66
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0327ec3>] ? _spin_unlock_irq+0x22/0x42
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01339c7>] trace_hardirqs_on+0xcf/0x120
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0327ec3>] _spin_unlock_irq+0x22/0x42
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0117322>] finish_task_switch+0x46/0x7d
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01172dc>] ? finish_task_switch+0x0/0x7d
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0325e39>] schedule+0x35d/0x3b3
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0121c39>] ? __mod_timer+0x8d/0x98
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326043>] schedule_timeout+0x73/0x91
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c012185c>] ? process_timeout+0x0/0xa
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0121c54>] msleep+0x10/0x16
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0244917>] velocity_suspend+0x2e9/0x302
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0133854>] ? mark_held_locks+0x4e/0x66
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326664>] ? __mutex_unlock_slowpath+0xd5/0xef
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01339dd>] ? trace_hardirqs_on+0xe5/0x120
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01e249e>] pci_device_suspend+0x1b/0x4b
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c023c625>] device_suspend+0x192/0x251
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138a7a>] suspend_devices_and_enter+0x3d/0xe0
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138c1c>] enter_state+0xb2/0x100
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138cfe>] state_store+0x94/0xac
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138c6a>] ? state_store+0x0/0xac
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01d50c5>] kobj_attr_store+0x1a/0x22
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c018969f>] sysfs_write_file+0xb8/0xe3
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01895e7>] ? sysfs_write_file+0x0/0xe3
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01597d7>] vfs_write+0x88/0xf8
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0159c6e>] sys_write+0x3b/0x60
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0102bfa>] sysenter_past_esp+0x5f/0xa5
>> Feb 24 14:00:20 alekhine kernel: [  456.716733]  =======================
>> Feb 24 14:00:20 alekhine kernel: [  456.729170] Intel machine check architecture supported.
>> Feb 24 14:00:20 alekhine kernel: [  456.729170] Intel machine check reporting enabled on CPU#0.
>> Feb 24 14:00:20 alekhine kernel: [  456.733181] Velocity is AUTO mode
>> Feb 24 14:00:20 alekhine kernel: [  456.733182] ACPI: PCI Interrupt 0000:00:0f.0[B] -> Link [ALKA] -> GSI 20 (level, low) -> IRQ 20
>> Feb 24 14:00:20 alekhine kernel: [  456.733184] ACPI: PCI Interrupt 0000:00:0f.1[A] -> Link [ALKA] -> GSI 20 (level, low) -> IRQ 20
>> Feb 24 14:00:20 alekhine kernel: [  456.733185] ACPI: PCI Interrupt 0000:00:10.0[A] -> GSI 21 (level, low) -> IRQ 21
>> Feb 24 14:00:20 alekhine kernel: [  456.733185] usb usb2: root hub lost power or was reset
>> Feb 24 14:00:20 alekhine kernel: [  456.744080] ACPI: PCI Interrupt 0000:00:10.1[A] -> GSI 21 (level, low) -> IRQ 21
>> Feb 24 14:00:20 alekhine kernel: [  456.744080] usb usb3: root hub lost power or was reset
>> Feb 24 14:00:20 alekhine kernel: [  456.754997] ACPI: PCI Interrupt 0000:00:10.2[B] -> GSI 21 (level, low) -> IRQ 21
>> Feb 24 14:00:20 alekhine kernel: [  456.754997] usb usb4: root hub lost power or was reset
>> Feb 24 14:00:20 alekhine kernel: [  456.765914] ACPI: PCI Interrupt 0000:00:10.3[B] -> GSI 21 (level, low) -> IRQ 21
>> Feb 24 14:00:20 alekhine kernel: [  456.765914] usb usb5: root hub lost power or was reset
>> Feb 24 14:00:20 alekhine kernel: [  456.776818] ACPI: PCI Interrupt 0000:00:10.4[C] -> GSI 21 (level, low) -> IRQ 21
>> Feb 24 14:00:20 alekhine kernel: [  456.787745] ACPI: PCI Interrupt 0000:00:11.5[C] -> GSI 22 (level, low) -> IRQ 22
>> Feb 24 14:00:20 alekhine kernel: [  456.789881] ACPI: PCI Interrupt 0000:01:00.0[A] -> GSI 16 (level, low) -> IRQ 16
>> Feb 24 14:00:20 alekhine kernel: [  456.789961] sd 3:0:0:0: [sda] Starting disk
>> Feb 24 14:00:20 alekhine kernel: [  457.031803] ata3.01: ACPI cmd ef/03:0c:00:00:00:b0 filtered out
>> Feb 24 14:00:20 alekhine kernel: [  457.031803] ata3.01: ACPI cmd ef/03:42:00:00:00:b0 filtered out
>> Feb 24 14:00:20 alekhine kernel: [  457.185224] ata3.00: ACPI cmd ef/03:0c:00:00:00:a0 filtered out
>> Feb 24 14:00:20 alekhine kernel: [  457.185224] ata3.00: ACPI cmd ef/03:42:00:00:00:a0 filtered out
>> Feb 24 14:00:20 alekhine kernel: [  457.340841] ata3.00: configured for UDMA/33
>> Feb 24 14:00:20 alekhine kernel: [  457.528347] ata3.01: configured for UDMA/33
>> Feb 24 14:00:20 alekhine kernel: [  460.975795] ata4.00: ACPI cmd ef/03:0c:00:00:00:a0 filtered out
>> Feb 24 14:00:20 alekhine kernel: [  460.975795] ata4.00: ACPI cmd ef/03:45:00:00:00:a0 filtered out
>> Feb 24 14:00:20 alekhine kernel: [  460.978040] ata4.00: configured for UDMA/100
>> Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] 156301488 512-byte hardware sectors (80026 MB)
>> Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] Write Protect is off
>> Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
>> Feb 24 14:00:20 alekhine kernel: [  461.524370] Restarting tasks ... <6>usb 2-1: USB disconnect, address 2
>> Feb 24 14:00:20 alekhine kernel: [  461.569374] done.
>> Feb 24 14:00:21 alekhine kernel: [  461.755858] usb 2-1: new low speed USB device using uhci_hcd and address 4
>> Feb 24 14:00:21 alekhine kernel: [  461.915256] usb 2-1: configuration #1 chosen from 1 choice
>> Feb 24 14:00:21 alekhine kernel: [  461.955599] input: Logitech USB Mouse as /devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.0/input/input5
>> Feb 24 14:00:21 alekhine kernel: [  461.979344] input: USB HID v1.10 Mouse [Logitech USB Mouse] on usb-0000:00:10.0-1
>> Feb 24 14:00:21 alekhine kernel: [  461.979553] usb 2-2: USB disconnect, address 3
>> Feb 24 14:00:21 alekhine kernel: [  462.236114] usb 2-2: new low speed USB device using uhci_hcd and address 5
>> Feb 24 14:00:21 alekhine kernel: [  462.405538] usb 2-2: configuration #1 chosen from 1 choice
>> Feb 24 14:00:21 alekhine kernel: [  462.439929] input: Microsoft Microsoft® Digital Media Pro Keyboard as /devices/pci0000:00/0000:00:10.0/usb2/2-2/2-2:1.0/input/input6
>> Feb 24 14:00:21 alekhine kernel: [  462.463834] input: USB HID v1.11 Keyboard [Microsoft Microsoft® Digital Media Pro Keyboard] on usb-0000:00:10.0-2
>> Feb 24 14:00:21 alekhine kernel: [  462.492181] input: Microsoft Microsoft® Digital Media Pro Keyboard as /devices/pci0000:00/0000:00:10.0/usb2/2-2/2-2:1.1/input/input7
>> Feb 24 14:00:21 alekhine kernel: [  462.517592] input: USB HID v1.11 Device [Microsoft Microsoft® Digital Media Pro Keyboard] on usb-0000:00:10.0-2

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-24 18:19 ` Kevin Winchester
@ 2008-02-24 20:00   ` Rafael J. Wysocki
  2008-02-24 23:35     ` Kevin Winchester
  0 siblings, 1 reply; 30+ messages in thread
From: Rafael J. Wysocki @ 2008-02-24 20:00 UTC (permalink / raw)
  To: Kevin Winchester
  Cc: Stephen Rothwell, linux-next, LKML, len.brown, pavel, linux-pm

On Sunday, 24 of February 2008, Kevin Winchester wrote:
> Stephen Rothwell wrote:
> > Hi all,

Hi,

> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> > 
> > 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
> > allmodconfig for both powerpc and x86_64.
> > 
> > There only one minor merge problem and a few build failures (the two in
> > Linus' tree have been fixed and the other reported).
> > 
> > We are up to 32 trees, more are welcome (even if they are currently
> > empty).
> > 
> > Status of my local build tests is at
> > http://kisskb.ellerman.id.au/kisskb/branch/9/.
> > 
> 
> I tried something with this tree that I haven't tried in a while - Suspend
> to RAM.  It has not often worked for me in the past with any tree, but
> normally there isn't any information in the log that indicates the cause of
> the failure.
> 
> Today was different - I attempted to suspend and resume from the console,
> and the machine did not come back up.  I found the following in my log -
> any help would be appreciated.
> 
> Feb 24 13:59:56 alekhine kernel: [  456.497875] PM: Syncing filesystems ... done.
> Feb 24 14:00:20 alekhine kernel: [  456.507273] Freezing user space processes ... (elapsed 0.00 seconds) done.
> Feb 24 14:00:20 alekhine kernel: [  456.510447] Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done.
> Feb 24 14:00:20 alekhine kernel: [  456.510754] ACPI: Preparing to enter system sleep state S3
> Feb 24 14:00:20 alekhine kernel: [  456.612370] Suspending console(s)
> Feb 24 14:00:20 alekhine kernel: [  456.616254] sd 3:0:0:0: [sda] Synchronizing SCSI cache
> Feb 24 14:00:20 alekhine kernel: [  456.616521] sd 3:0:0:0: [sda] Stopping disk
> Feb 24 14:00:20 alekhine kernel: [  456.618221] ACPI: PCI interrupt for device 0000:00:11.5 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.630296] ACPI: PCI interrupt for device 0000:00:10.4 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.641085] ACPI: PCI interrupt for device 0000:00:10.3 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.651877] ACPI: PCI interrupt for device 0000:00:10.2 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.662716] ACPI: PCI interrupt for device 0000:00:10.1 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.673550] ACPI: PCI interrupt for device 0000:00:10.0 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.684385] ACPI: PCI interrupt for device 0000:00:0f.1 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.695056] ACPI: PCI interrupt for device 0000:00:0f.0 disabled
> Feb 24 14:00:20 alekhine kernel: [  456.705856] 5 locks held by bash/2929:
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
> Feb 24 14:00:20 alekhine kernel: [  456.705856] irq event stamp: 19374
> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
> Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
> Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
> Feb 24 14:00:20 alekhine kernel: [  456.705856] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01177c7>] __schedule_bug+0x58/0x5f
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0325b43>] schedule+0x67/0x3b3

Well, could you check what's at schedule+0x67, please?

> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c39>] ? __mod_timer+0x8d/0x98
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326043>] schedule_timeout+0x73/0x91
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c012185c>] ? process_timeout+0x0/0xa
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c54>] msleep+0x10/0x16
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0244917>] velocity_suspend+0x2e9/0x302

velocity_suspend() seems to be at fault.

At the moment I have to take care of some more urgent things, I'll have a look
at it tomorrow.

> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0133854>] ? mark_held_locks+0x4e/0x66
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326664>] ? __mutex_unlock_slowpath+0xd5/0xef
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01339dd>] ? trace_hardirqs_on+0xe5/0x120
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e249e>] pci_device_suspend+0x1b/0x4b
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c023c625>] device_suspend+0x192/0x251
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138a7a>] suspend_devices_and_enter+0x3d/0xe0
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138c1c>] enter_state+0xb2/0x100
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138cfe>] state_store+0x94/0xac
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138c6a>] ? state_store+0x0/0xac
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01d50c5>] kobj_attr_store+0x1a/0x22
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c018969f>] sysfs_write_file+0xb8/0xe3
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01895e7>] ? sysfs_write_file+0x0/0xe3
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01597d7>] vfs_write+0x88/0xf8
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0159c6e>] sys_write+0x3b/0x60
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0102bfa>] sysenter_past_esp+0x5f/0xa5
> Feb 24 14:00:20 alekhine kernel: [  456.705856]  =======================
> Feb 24 14:00:20 alekhine kernel: [  456.716732] 
> Feb 24 14:00:20 alekhine kernel: [  456.716732] =================================
> Feb 24 14:00:20 alekhine kernel: [  456.716732] [ INFO: inconsistent lock state ]
> Feb 24 14:00:20 alekhine kernel: [  456.716732] 2.6.25-rc2-next-20080224 #58
> Feb 24 14:00:20 alekhine kernel: [  456.716732] ---------------------------------
> Feb 24 14:00:20 alekhine kernel: [  456.716732] inconsistent {in-hardirq-W} -> {hardirq-on-W} usage.
> Feb 24 14:00:20 alekhine kernel: [  456.716732] bash/2929 [HC0[0]:SC0[0]:HE1:SE1] takes:
> Feb 24 14:00:20 alekhine kernel: [  456.716732]  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
> Feb 24 14:00:20 alekhine kernel: [  456.716732] {in-hardirq-W} state was registered at:
> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c013416b>] __lock_acquire+0x3ac/0xb43
> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0134963>] lock_acquire+0x61/0x7d
> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0243940>] velocity_intr+0x24/0x579
> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c03279fb>] _spin_lock+0x23/0x32
> Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0243940>] velocity_intr+0x24/0x579
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c0243940>] velocity_intr+0x24/0x579
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c02ca5e1>] snd_via8233_interrupt+0xdc/0xe7
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a884>] handle_fasteoi_irq+0x95/0xab
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c01398b3>] handle_IRQ_event+0x1a/0x46
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a88d>] handle_fasteoi_irq+0x9e/0xab
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a7ef>] handle_fasteoi_irq+0x0/0xab
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c0105010>] do_IRQ+0xab/0xd4
> Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<ffffffff>] 0xffffffff
> Feb 24 14:00:20 alekhine kernel: [  456.716733] irq event stamp: 19374
> Feb 24 14:00:20 alekhine kernel: [  456.716733] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
> Feb 24 14:00:20 alekhine kernel: [  456.716733] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
> Feb 24 14:00:20 alekhine kernel: [  456.716733] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
> Feb 24 14:00:20 alekhine kernel: [  456.716733] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
> Feb 24 14:00:20 alekhine kernel: [  456.716733] 
> Feb 24 14:00:20 alekhine kernel: [  456.716733] other info that might help us debug this:
> Feb 24 14:00:20 alekhine kernel: [  456.716733] 5 locks held by bash/2929:
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
> Feb 24 14:00:20 alekhine kernel: [  456.716733] 
> Feb 24 14:00:20 alekhine kernel: [  456.716733] stack backtrace:
> Feb 24 14:00:20 alekhine kernel: [  456.716733] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0132d3b>] print_usage_bug+0x10d/0x11a
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c013361f>] mark_lock+0x1f1/0x3d8
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0133854>] mark_held_locks+0x4e/0x66
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0327ec3>] ? _spin_unlock_irq+0x22/0x42
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01339c7>] trace_hardirqs_on+0xcf/0x120
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0327ec3>] _spin_unlock_irq+0x22/0x42
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0117322>] finish_task_switch+0x46/0x7d
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01172dc>] ? finish_task_switch+0x0/0x7d
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0325e39>] schedule+0x35d/0x3b3
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0121c39>] ? __mod_timer+0x8d/0x98
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326043>] schedule_timeout+0x73/0x91
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c012185c>] ? process_timeout+0x0/0xa
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0121c54>] msleep+0x10/0x16
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0244917>] velocity_suspend+0x2e9/0x302
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0133854>] ? mark_held_locks+0x4e/0x66
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326664>] ? __mutex_unlock_slowpath+0xd5/0xef
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01339dd>] ? trace_hardirqs_on+0xe5/0x120
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01e249e>] pci_device_suspend+0x1b/0x4b
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c023c625>] device_suspend+0x192/0x251
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138a7a>] suspend_devices_and_enter+0x3d/0xe0
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138c1c>] enter_state+0xb2/0x100
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138cfe>] state_store+0x94/0xac
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138c6a>] ? state_store+0x0/0xac
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01d50c5>] kobj_attr_store+0x1a/0x22
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c018969f>] sysfs_write_file+0xb8/0xe3
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01895e7>] ? sysfs_write_file+0x0/0xe3
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01597d7>] vfs_write+0x88/0xf8
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0159c6e>] sys_write+0x3b/0x60
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0102bfa>] sysenter_past_esp+0x5f/0xa5
> Feb 24 14:00:20 alekhine kernel: [  456.716733]  =======================
> Feb 24 14:00:20 alekhine kernel: [  456.729170] Intel machine check architecture supported.
> Feb 24 14:00:20 alekhine kernel: [  456.729170] Intel machine check reporting enabled on CPU#0.
> Feb 24 14:00:20 alekhine kernel: [  456.733181] Velocity is AUTO mode
> Feb 24 14:00:20 alekhine kernel: [  456.733182] ACPI: PCI Interrupt 0000:00:0f.0[B] -> Link [ALKA] -> GSI 20 (level, low) -> IRQ 20
> Feb 24 14:00:20 alekhine kernel: [  456.733184] ACPI: PCI Interrupt 0000:00:0f.1[A] -> Link [ALKA] -> GSI 20 (level, low) -> IRQ 20
> Feb 24 14:00:20 alekhine kernel: [  456.733185] ACPI: PCI Interrupt 0000:00:10.0[A] -> GSI 21 (level, low) -> IRQ 21
> Feb 24 14:00:20 alekhine kernel: [  456.733185] usb usb2: root hub lost power or was reset
> Feb 24 14:00:20 alekhine kernel: [  456.744080] ACPI: PCI Interrupt 0000:00:10.1[A] -> GSI 21 (level, low) -> IRQ 21
> Feb 24 14:00:20 alekhine kernel: [  456.744080] usb usb3: root hub lost power or was reset
> Feb 24 14:00:20 alekhine kernel: [  456.754997] ACPI: PCI Interrupt 0000:00:10.2[B] -> GSI 21 (level, low) -> IRQ 21
> Feb 24 14:00:20 alekhine kernel: [  456.754997] usb usb4: root hub lost power or was reset
> Feb 24 14:00:20 alekhine kernel: [  456.765914] ACPI: PCI Interrupt 0000:00:10.3[B] -> GSI 21 (level, low) -> IRQ 21
> Feb 24 14:00:20 alekhine kernel: [  456.765914] usb usb5: root hub lost power or was reset
> Feb 24 14:00:20 alekhine kernel: [  456.776818] ACPI: PCI Interrupt 0000:00:10.4[C] -> GSI 21 (level, low) -> IRQ 21
> Feb 24 14:00:20 alekhine kernel: [  456.787745] ACPI: PCI Interrupt 0000:00:11.5[C] -> GSI 22 (level, low) -> IRQ 22
> Feb 24 14:00:20 alekhine kernel: [  456.789881] ACPI: PCI Interrupt 0000:01:00.0[A] -> GSI 16 (level, low) -> IRQ 16
> Feb 24 14:00:20 alekhine kernel: [  456.789961] sd 3:0:0:0: [sda] Starting disk
> Feb 24 14:00:20 alekhine kernel: [  457.031803] ata3.01: ACPI cmd ef/03:0c:00:00:00:b0 filtered out
> Feb 24 14:00:20 alekhine kernel: [  457.031803] ata3.01: ACPI cmd ef/03:42:00:00:00:b0 filtered out
> Feb 24 14:00:20 alekhine kernel: [  457.185224] ata3.00: ACPI cmd ef/03:0c:00:00:00:a0 filtered out
> Feb 24 14:00:20 alekhine kernel: [  457.185224] ata3.00: ACPI cmd ef/03:42:00:00:00:a0 filtered out
> Feb 24 14:00:20 alekhine kernel: [  457.340841] ata3.00: configured for UDMA/33
> Feb 24 14:00:20 alekhine kernel: [  457.528347] ata3.01: configured for UDMA/33
> Feb 24 14:00:20 alekhine kernel: [  460.975795] ata4.00: ACPI cmd ef/03:0c:00:00:00:a0 filtered out
> Feb 24 14:00:20 alekhine kernel: [  460.975795] ata4.00: ACPI cmd ef/03:45:00:00:00:a0 filtered out
> Feb 24 14:00:20 alekhine kernel: [  460.978040] ata4.00: configured for UDMA/100
> Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] 156301488 512-byte hardware sectors (80026 MB)
> Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] Write Protect is off
> Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
> Feb 24 14:00:20 alekhine kernel: [  461.524370] Restarting tasks ... <6>usb 2-1: USB disconnect, address 2
> Feb 24 14:00:20 alekhine kernel: [  461.569374] done.
> Feb 24 14:00:21 alekhine kernel: [  461.755858] usb 2-1: new low speed USB device using uhci_hcd and address 4
> Feb 24 14:00:21 alekhine kernel: [  461.915256] usb 2-1: configuration #1 chosen from 1 choice
> Feb 24 14:00:21 alekhine kernel: [  461.955599] input: Logitech USB Mouse as /devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.0/input/input5
> Feb 24 14:00:21 alekhine kernel: [  461.979344] input: USB HID v1.10 Mouse [Logitech USB Mouse] on usb-0000:00:10.0-1
> Feb 24 14:00:21 alekhine kernel: [  461.979553] usb 2-2: USB disconnect, address 3
> Feb 24 14:00:21 alekhine kernel: [  462.236114] usb 2-2: new low speed USB device using uhci_hcd and address 5
> Feb 24 14:00:21 alekhine kernel: [  462.405538] usb 2-2: configuration #1 chosen from 1 choice
> Feb 24 14:00:21 alekhine kernel: [  462.439929] input: Microsoft Microsoft® Digital Media Pro Keyboard as /devices/pci0000:00/0000:00:10.0/usb2/2-2/2-2:1.0/input/input6
> Feb 24 14:00:21 alekhine kernel: [  462.463834] input: USB HID v1.11 Keyboard [Microsoft Microsoft® Digital Media Pro Keyboard] on usb-0000:00:10.0-2
> Feb 24 14:00:21 alekhine kernel: [  462.492181] input: Microsoft Microsoft® Digital Media Pro Keyboard as /devices/pci0000:00/0000:00:10.0/usb2/2-2/2-2:1.1/input/input7
> Feb 24 14:00:21 alekhine kernel: [  462.517592] input: USB HID v1.11 Device [Microsoft Microsoft® Digital Media Pro Keyboard] on usb-0000:00:10.0-2

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: linux-next: Tree for Feb 24
  2008-02-24  5:23 Stephen Rothwell
@ 2008-02-24 18:19 ` Kevin Winchester
  2008-02-24 20:00   ` Rafael J. Wysocki
  2008-02-25 21:56 ` Geert Uytterhoeven
  1 sibling, 1 reply; 30+ messages in thread
From: Kevin Winchester @ 2008-02-24 18:19 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML, len.brown, pavel, rjw, linux-pm

Stephen Rothwell wrote:
> Hi all,
> 
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> 
> 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
> allmodconfig for both powerpc and x86_64.
> 
> There only one minor merge problem and a few build failures (the two in
> Linus' tree have been fixed and the other reported).
> 
> We are up to 32 trees, more are welcome (even if they are currently
> empty).
> 
> Status of my local build tests is at
> http://kisskb.ellerman.id.au/kisskb/branch/9/.
> 

I tried something with this tree that I haven't tried in a while - Suspend
to RAM.  It has not often worked for me in the past with any tree, but
normally there isn't any information in the log that indicates the cause of
the failure.

Today was different - I attempted to suspend and resume from the console,
and the machine did not come back up.  I found the following in my log -
any help would be appreciated.

Feb 24 13:59:56 alekhine kernel: [  456.497875] PM: Syncing filesystems ... done.
Feb 24 14:00:20 alekhine kernel: [  456.507273] Freezing user space processes ... (elapsed 0.00 seconds) done.
Feb 24 14:00:20 alekhine kernel: [  456.510447] Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done.
Feb 24 14:00:20 alekhine kernel: [  456.510754] ACPI: Preparing to enter system sleep state S3
Feb 24 14:00:20 alekhine kernel: [  456.612370] Suspending console(s)
Feb 24 14:00:20 alekhine kernel: [  456.616254] sd 3:0:0:0: [sda] Synchronizing SCSI cache
Feb 24 14:00:20 alekhine kernel: [  456.616521] sd 3:0:0:0: [sda] Stopping disk
Feb 24 14:00:20 alekhine kernel: [  456.618221] ACPI: PCI interrupt for device 0000:00:11.5 disabled
Feb 24 14:00:20 alekhine kernel: [  456.630296] ACPI: PCI interrupt for device 0000:00:10.4 disabled
Feb 24 14:00:20 alekhine kernel: [  456.641085] ACPI: PCI interrupt for device 0000:00:10.3 disabled
Feb 24 14:00:20 alekhine kernel: [  456.651877] ACPI: PCI interrupt for device 0000:00:10.2 disabled
Feb 24 14:00:20 alekhine kernel: [  456.662716] ACPI: PCI interrupt for device 0000:00:10.1 disabled
Feb 24 14:00:20 alekhine kernel: [  456.673550] ACPI: PCI interrupt for device 0000:00:10.0 disabled
Feb 24 14:00:20 alekhine kernel: [  456.684385] ACPI: PCI interrupt for device 0000:00:0f.1 disabled
Feb 24 14:00:20 alekhine kernel: [  456.695056] ACPI: PCI interrupt for device 0000:00:0f.0 disabled
Feb 24 14:00:20 alekhine kernel: [  456.705856] 5 locks held by bash/2929:
Feb 24 14:00:20 alekhine kernel: [  456.705856]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
Feb 24 14:00:20 alekhine kernel: [  456.705856]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
Feb 24 14:00:20 alekhine kernel: [  456.705856]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
Feb 24 14:00:20 alekhine kernel: [  456.705856]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
Feb 24 14:00:20 alekhine kernel: [  456.705856]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
Feb 24 14:00:20 alekhine kernel: [  456.705856] irq event stamp: 19374
Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
Feb 24 14:00:20 alekhine kernel: [  456.705856] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
Feb 24 14:00:20 alekhine kernel: [  456.705856] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
Feb 24 14:00:20 alekhine kernel: [  456.705856] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01177c7>] __schedule_bug+0x58/0x5f
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0325b43>] schedule+0x67/0x3b3
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c39>] ? __mod_timer+0x8d/0x98
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326043>] schedule_timeout+0x73/0x91
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c012185c>] ? process_timeout+0x0/0xa
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0121c54>] msleep+0x10/0x16
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0244917>] velocity_suspend+0x2e9/0x302
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0133854>] ? mark_held_locks+0x4e/0x66
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0326664>] ? __mutex_unlock_slowpath+0xd5/0xef
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01339dd>] ? trace_hardirqs_on+0xe5/0x120
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01e249e>] pci_device_suspend+0x1b/0x4b
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c023c625>] device_suspend+0x192/0x251
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138a7a>] suspend_devices_and_enter+0x3d/0xe0
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138c1c>] enter_state+0xb2/0x100
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138cfe>] state_store+0x94/0xac
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0138c6a>] ? state_store+0x0/0xac
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01d50c5>] kobj_attr_store+0x1a/0x22
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c018969f>] sysfs_write_file+0xb8/0xe3
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01895e7>] ? sysfs_write_file+0x0/0xe3
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c01597d7>] vfs_write+0x88/0xf8
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0159c6e>] sys_write+0x3b/0x60
Feb 24 14:00:20 alekhine kernel: [  456.705856]  [<c0102bfa>] sysenter_past_esp+0x5f/0xa5
Feb 24 14:00:20 alekhine kernel: [  456.705856]  =======================
Feb 24 14:00:20 alekhine kernel: [  456.716732] 
Feb 24 14:00:20 alekhine kernel: [  456.716732] =================================
Feb 24 14:00:20 alekhine kernel: [  456.716732] [ INFO: inconsistent lock state ]
Feb 24 14:00:20 alekhine kernel: [  456.716732] 2.6.25-rc2-next-20080224 #58
Feb 24 14:00:20 alekhine kernel: [  456.716732] ---------------------------------
Feb 24 14:00:20 alekhine kernel: [  456.716732] inconsistent {in-hardirq-W} -> {hardirq-on-W} usage.
Feb 24 14:00:20 alekhine kernel: [  456.716732] bash/2929 [HC0[0]:SC0[0]:HE1:SE1] takes:
Feb 24 14:00:20 alekhine kernel: [  456.716732]  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
Feb 24 14:00:20 alekhine kernel: [  456.716732] {in-hardirq-W} state was registered at:
Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c013416b>] __lock_acquire+0x3ac/0xb43
Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0134963>] lock_acquire+0x61/0x7d
Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0243940>] velocity_intr+0x24/0x579
Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c03279fb>] _spin_lock+0x23/0x32
Feb 24 14:00:20 alekhine kernel: [  456.716732]   [<c0243940>] velocity_intr+0x24/0x579
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c0243940>] velocity_intr+0x24/0x579
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c02ca5e1>] snd_via8233_interrupt+0xdc/0xe7
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a884>] handle_fasteoi_irq+0x95/0xab
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c01398b3>] handle_IRQ_event+0x1a/0x46
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a88d>] handle_fasteoi_irq+0x9e/0xab
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c013a7ef>] handle_fasteoi_irq+0x0/0xab
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<c0105010>] do_IRQ+0xab/0xd4
Feb 24 14:00:20 alekhine kernel: [  456.716733]   [<ffffffff>] 0xffffffff
Feb 24 14:00:20 alekhine kernel: [  456.716733] irq event stamp: 19374
Feb 24 14:00:20 alekhine kernel: [  456.716733] hardirqs last  enabled at (19373): [<c0326664>] __mutex_unlock_slowpath+0xd5/0xef
Feb 24 14:00:20 alekhine kernel: [  456.716733] hardirqs last disabled at (19374): [<c0327bca>] _spin_lock_irqsave+0xf/0x3c
Feb 24 14:00:20 alekhine kernel: [  456.716733] softirqs last  enabled at (18484): [<c011e6ba>] __do_softirq+0x99/0x9e
Feb 24 14:00:20 alekhine kernel: [  456.716733] softirqs last disabled at (18479): [<c0104f15>] do_softirq+0x58/0xa8
Feb 24 14:00:20 alekhine kernel: [  456.716733] 
Feb 24 14:00:20 alekhine kernel: [  456.716733] other info that might help us debug this:
Feb 24 14:00:20 alekhine kernel: [  456.716733] 5 locks held by bash/2929:
Feb 24 14:00:20 alekhine kernel: [  456.716733]  #0:  (&buffer->mutex){--..}, at: [<c018960c>] sysfs_write_file+0x25/0xe3
Feb 24 14:00:20 alekhine kernel: [  456.716733]  #1:  (pm_mutex){--..}, at: [<c0138c54>] enter_state+0xea/0x100
Feb 24 14:00:20 alekhine kernel: [  456.716733]  #2:  (pm_sleep_rwsem){----}, at: [<c023c4b8>] device_suspend+0x25/0x251
Feb 24 14:00:20 alekhine kernel: [  456.716733]  #3:  (&data->update_lock#2){--..}, at: [<c029cb2b>] abituguru_suspend+0x13/0x18
Feb 24 14:00:20 alekhine kernel: [  456.716733]  #4:  (&vptr->lock){++..}, at: [<c0244665>] velocity_suspend+0x37/0x302
Feb 24 14:00:20 alekhine kernel: [  456.716733] 
Feb 24 14:00:20 alekhine kernel: [  456.716733] stack backtrace:
Feb 24 14:00:20 alekhine kernel: [  456.716733] Pid: 2929, comm: bash Not tainted 2.6.25-rc2-next-20080224 #58
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0132d3b>] print_usage_bug+0x10d/0x11a
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c013361f>] mark_lock+0x1f1/0x3d8
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0133854>] mark_held_locks+0x4e/0x66
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0327ec3>] ? _spin_unlock_irq+0x22/0x42
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01339c7>] trace_hardirqs_on+0xcf/0x120
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0327ec3>] _spin_unlock_irq+0x22/0x42
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0117322>] finish_task_switch+0x46/0x7d
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01172dc>] ? finish_task_switch+0x0/0x7d
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0325e39>] schedule+0x35d/0x3b3
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0121c39>] ? __mod_timer+0x8d/0x98
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326043>] schedule_timeout+0x73/0x91
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c012185c>] ? process_timeout+0x0/0xa
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326075>] schedule_timeout_uninterruptible+0x14/0x16
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0121c54>] msleep+0x10/0x16
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01e0e51>] pci_set_power_state+0x17f/0x200
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0244917>] velocity_suspend+0x2e9/0x302
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0133854>] ? mark_held_locks+0x4e/0x66
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0326664>] ? __mutex_unlock_slowpath+0xd5/0xef
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01339dd>] ? trace_hardirqs_on+0xe5/0x120
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01e249e>] pci_device_suspend+0x1b/0x4b
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c023c625>] device_suspend+0x192/0x251
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138a7a>] suspend_devices_and_enter+0x3d/0xe0
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138c1c>] enter_state+0xb2/0x100
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138cfe>] state_store+0x94/0xac
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0138c6a>] ? state_store+0x0/0xac
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01d50c5>] kobj_attr_store+0x1a/0x22
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c018969f>] sysfs_write_file+0xb8/0xe3
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01895e7>] ? sysfs_write_file+0x0/0xe3
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c01597d7>] vfs_write+0x88/0xf8
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0159c6e>] sys_write+0x3b/0x60
Feb 24 14:00:20 alekhine kernel: [  456.716733]  [<c0102bfa>] sysenter_past_esp+0x5f/0xa5
Feb 24 14:00:20 alekhine kernel: [  456.716733]  =======================
Feb 24 14:00:20 alekhine kernel: [  456.729170] Intel machine check architecture supported.
Feb 24 14:00:20 alekhine kernel: [  456.729170] Intel machine check reporting enabled on CPU#0.
Feb 24 14:00:20 alekhine kernel: [  456.733181] Velocity is AUTO mode
Feb 24 14:00:20 alekhine kernel: [  456.733182] ACPI: PCI Interrupt 0000:00:0f.0[B] -> Link [ALKA] -> GSI 20 (level, low) -> IRQ 20
Feb 24 14:00:20 alekhine kernel: [  456.733184] ACPI: PCI Interrupt 0000:00:0f.1[A] -> Link [ALKA] -> GSI 20 (level, low) -> IRQ 20
Feb 24 14:00:20 alekhine kernel: [  456.733185] ACPI: PCI Interrupt 0000:00:10.0[A] -> GSI 21 (level, low) -> IRQ 21
Feb 24 14:00:20 alekhine kernel: [  456.733185] usb usb2: root hub lost power or was reset
Feb 24 14:00:20 alekhine kernel: [  456.744080] ACPI: PCI Interrupt 0000:00:10.1[A] -> GSI 21 (level, low) -> IRQ 21
Feb 24 14:00:20 alekhine kernel: [  456.744080] usb usb3: root hub lost power or was reset
Feb 24 14:00:20 alekhine kernel: [  456.754997] ACPI: PCI Interrupt 0000:00:10.2[B] -> GSI 21 (level, low) -> IRQ 21
Feb 24 14:00:20 alekhine kernel: [  456.754997] usb usb4: root hub lost power or was reset
Feb 24 14:00:20 alekhine kernel: [  456.765914] ACPI: PCI Interrupt 0000:00:10.3[B] -> GSI 21 (level, low) -> IRQ 21
Feb 24 14:00:20 alekhine kernel: [  456.765914] usb usb5: root hub lost power or was reset
Feb 24 14:00:20 alekhine kernel: [  456.776818] ACPI: PCI Interrupt 0000:00:10.4[C] -> GSI 21 (level, low) -> IRQ 21
Feb 24 14:00:20 alekhine kernel: [  456.787745] ACPI: PCI Interrupt 0000:00:11.5[C] -> GSI 22 (level, low) -> IRQ 22
Feb 24 14:00:20 alekhine kernel: [  456.789881] ACPI: PCI Interrupt 0000:01:00.0[A] -> GSI 16 (level, low) -> IRQ 16
Feb 24 14:00:20 alekhine kernel: [  456.789961] sd 3:0:0:0: [sda] Starting disk
Feb 24 14:00:20 alekhine kernel: [  457.031803] ata3.01: ACPI cmd ef/03:0c:00:00:00:b0 filtered out
Feb 24 14:00:20 alekhine kernel: [  457.031803] ata3.01: ACPI cmd ef/03:42:00:00:00:b0 filtered out
Feb 24 14:00:20 alekhine kernel: [  457.185224] ata3.00: ACPI cmd ef/03:0c:00:00:00:a0 filtered out
Feb 24 14:00:20 alekhine kernel: [  457.185224] ata3.00: ACPI cmd ef/03:42:00:00:00:a0 filtered out
Feb 24 14:00:20 alekhine kernel: [  457.340841] ata3.00: configured for UDMA/33
Feb 24 14:00:20 alekhine kernel: [  457.528347] ata3.01: configured for UDMA/33
Feb 24 14:00:20 alekhine kernel: [  460.975795] ata4.00: ACPI cmd ef/03:0c:00:00:00:a0 filtered out
Feb 24 14:00:20 alekhine kernel: [  460.975795] ata4.00: ACPI cmd ef/03:45:00:00:00:a0 filtered out
Feb 24 14:00:20 alekhine kernel: [  460.978040] ata4.00: configured for UDMA/100
Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] 156301488 512-byte hardware sectors (80026 MB)
Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] Write Protect is off
Feb 24 14:00:20 alekhine kernel: [  460.981191] sd 3:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
Feb 24 14:00:20 alekhine kernel: [  461.524370] Restarting tasks ... <6>usb 2-1: USB disconnect, address 2
Feb 24 14:00:20 alekhine kernel: [  461.569374] done.
Feb 24 14:00:21 alekhine kernel: [  461.755858] usb 2-1: new low speed USB device using uhci_hcd and address 4
Feb 24 14:00:21 alekhine kernel: [  461.915256] usb 2-1: configuration #1 chosen from 1 choice
Feb 24 14:00:21 alekhine kernel: [  461.955599] input: Logitech USB Mouse as /devices/pci0000:00/0000:00:10.0/usb2/2-1/2-1:1.0/input/input5
Feb 24 14:00:21 alekhine kernel: [  461.979344] input: USB HID v1.10 Mouse [Logitech USB Mouse] on usb-0000:00:10.0-1
Feb 24 14:00:21 alekhine kernel: [  461.979553] usb 2-2: USB disconnect, address 3
Feb 24 14:00:21 alekhine kernel: [  462.236114] usb 2-2: new low speed USB device using uhci_hcd and address 5
Feb 24 14:00:21 alekhine kernel: [  462.405538] usb 2-2: configuration #1 chosen from 1 choice
Feb 24 14:00:21 alekhine kernel: [  462.439929] input: Microsoft Microsoft® Digital Media Pro Keyboard as /devices/pci0000:00/0000:00:10.0/usb2/2-2/2-2:1.0/input/input6
Feb 24 14:00:21 alekhine kernel: [  462.463834] input: USB HID v1.11 Keyboard [Microsoft Microsoft® Digital Media Pro Keyboard] on usb-0000:00:10.0-2
Feb 24 14:00:21 alekhine kernel: [  462.492181] input: Microsoft Microsoft® Digital Media Pro Keyboard as /devices/pci0000:00/0000:00:10.0/usb2/2-2/2-2:1.1/input/input7
Feb 24 14:00:21 alekhine kernel: [  462.517592] input: USB HID v1.11 Device [Microsoft Microsoft® Digital Media Pro Keyboard] on usb-0000:00:10.0-2

^ permalink raw reply	[flat|nested] 30+ messages in thread

* linux-next: Tree for Feb 24
@ 2008-02-24  5:23 Stephen Rothwell
  2008-02-24 18:19 ` Kevin Winchester
  2008-02-25 21:56 ` Geert Uytterhoeven
  0 siblings, 2 replies; 30+ messages in thread
From: Stephen Rothwell @ 2008-02-24  5:23 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

Hi all,

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.

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
allmodconfig for both powerpc and x86_64.

There only one minor merge problem and a few build failures (the two in
Linus' tree have been fixed and the other reported).

We are up to 32 trees, more are welcome (even if they are currently
empty).

Status of my local build tests is at
http://kisskb.ellerman.id.au/kisskb/branch/9/.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2022-02-25  2:16 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-25  6:31 linux-next: Tree for Feb 24 Stephen Rothwell
2008-02-25 10:12 ` Frank Seidel
2008-02-25 11:11   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-02-25  2:16 broonie
2021-02-24  3:36 Stephen Rothwell
2020-02-24  4:32 Stephen Rothwell
2017-02-24  3:01 Stephen Rothwell
2016-02-24  5:34 Stephen Rothwell
2016-02-24  6:32 ` Sedat Dilek
2016-02-24 14:37   ` Benjamin LaHaise
2016-03-17 10:21     ` Sedat Dilek
2016-03-17 10:27       ` Stephen Rothwell
2016-03-17 10:37         ` Sedat Dilek
2015-02-24  3:02 Stephen Rothwell
2014-02-24  6:37 Stephen Rothwell
2013-02-26  3:16 Stephen Rothwell
2013-02-26  5:00 ` Sedat Dilek
2013-02-26  5:30   ` Stephen Rothwell
2012-02-24  6:05 Stephen Rothwell
2008-02-24  5:23 Stephen Rothwell
2008-02-24 18:19 ` Kevin Winchester
2008-02-24 20:00   ` Rafael J. Wysocki
2008-02-24 23:35     ` Kevin Winchester
2008-02-24 23:43       ` Rafael J. Wysocki
2008-02-25  0:23         ` Kevin Winchester
2008-02-25  9:26       ` Pavel Machek
2008-02-25 21:56 ` Geert Uytterhoeven
2008-02-25 22:30   ` Randy Dunlap
2008-02-25 23:49   ` Stephen Rothwell
2008-02-26  7:55     ` Geert Uytterhoeven

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).