From: Stephen Rothwell <email@example.com>
Cc: LKML <firstname.lastname@example.org>
Subject: linux-next: Tree for May 13
Date: Fri, 13 May 2011 15:05:19 +1000 [thread overview]
Message-ID: <email@example.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 10138 bytes --]
Changes since 20110512:
Dropped trees: xen
The arm tree gained a build failure for which I applied a patch.
The nfs tree lost its build failure.
The wireless tree lost its build failure.
The tip tree gained conflicts against the arm tree.
The namepsace tree lost its build failure.
The staging tree gained a conflict against Linus' tree.
I have created today's linux-next tree at
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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
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 191 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
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.
Stephen Rothwell firstname.lastname@example.org
$ git checkout master
$ git reset --hard stable
CONFLICT (content): Merge conflict in drivers/gpio/nomadik-gpio.c
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-tx.c
CONFLICT (content): Merge conflict in net/mac80211/sta_info.h
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_stats.c
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc_pio.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in drivers/mfd/twl4030-power.c
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.c
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.h
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
CONFLICT (content): Merge conflict in lib/flex_array.c
CONFLICT (content): Merge conflict in security/selinux/avc.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/mips/kernel/i8253.c
CONFLICT (content): Merge conflict in arch/x86/kernel/i8253.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
CONFLICT (content): Merge conflict in drivers/platform/x86/Makefile
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
CONFLICT (content): Merge conflict in drivers/platform/x86/sony-laptop.c
CONFLICT (content): Merge conflict in arch/m68k/kernel/entry_mm.S
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c
CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intelmid.c
CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree.
CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/usbip/vhci_sysfs.c
$ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c
Applying: clocksource: fix up for generic i8253 conversions
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-13 5:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 5:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-13 8:19 linux-next: Tree for May 13 Stephen Rothwell
2021-05-13 5:44 Stephen Rothwell
2019-05-13 4:25 Stephen Rothwell
2016-05-13 5:44 Stephen Rothwell
2015-05-13 8:09 Stephen Rothwell
2014-05-13 8:16 Stephen Rothwell
2014-05-13 8:23 ` Stephen Rothwell
2013-05-13 2:54 Stephen Rothwell
2010-05-13 7:15 Stephen Rothwell
2009-05-13 6:48 Stephen Rothwell
2008-05-13 5:52 Stephen Rothwell
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).