* Re: linux-next: build warning after merge of the moduleh tree
From: Rafael J. Wysocki @ 2011-08-18 20:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Paul Gortmaker, linux-next, linux-kernel
In-Reply-To: <20110818192754.972382bbed8fa3adc6dca9c5@canb.auug.org.au>
On Thursday, August 18, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> On Thu, 18 Aug 2011 10:26:51 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > Do you mean that drivers/base/power/common.c should include module.h
> > or something else?
>
> Yes, that is exactly what I mean :-) See Rule 1 in
> Documentation/SubmitChecklist. The reason it is different, is because
> the module.h splitup is cerating export.h for files that just need
> EXPORT_SYMBOL (like this file).
OK, I've modified common.c so that module.h is included.
Thanks,
Rafael
^ permalink raw reply
* Re: [PATCH] evm: add Kconfig TCG_TPM dependency
From: Randy Dunlap @ 2011-08-18 17:38 UTC (permalink / raw)
To: Mimi Zohar
Cc: linux-security-module, linux-next, linux-kernel, James Morris,
Stephen Rothwell, David Safford, Mimi Zohar
In-Reply-To: <1313621496-8308-1-git-send-email-zohar@linux.vnet.ibm.com>
On Wed, 17 Aug 2011 18:51:36 -0400 Mimi Zohar wrote:
> Although the EVM encrypted-key should be encrypted/decrypted using a
> trusted-key, a user-defined key could be used instead. When using a user-
> defined key, a TCG_TPM dependency should not be required. Unfortunately,
> the encrypted-key code needs to be refactored a bit in order to remove
> this dependency.
>
> This patch adds the TCG_TPM dependency.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>,
> Randy Dunlap <rdunlap@xenotimenet>
> Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
> security/integrity/evm/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig
> index 444877d..884617d 100644
> --- a/security/integrity/evm/Kconfig
> +++ b/security/integrity/evm/Kconfig
> @@ -1,6 +1,6 @@
> config EVM
> boolean "EVM support"
> - depends on SECURITY && KEYS
> + depends on SECURITY && KEYS && TCG_TPM
> select CRYPTO_HMAC
> select CRYPTO_MD5
> select CRYPTO_SHA1
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: Tree for Aug 18 (GNU patch and "git diffs: Support symlinks")
From: Sedat Dilek @ 2011-08-18 9:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, git, Jonathan Nieder, Christoph Berg
[-- Attachment #1: Type: text/plain, Size: 1795 bytes --]
On Thu, Aug 18, 2011 at 8:00 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> The powerpc allyesconfig build still fails today.
>
> Changes since 20110817:
>
> The sound-asoc tree lost its build failure.
>
> The tip tree gained a conflict against Linus' tree.
>
> The moduleh tree lost 2 of its merge fixups, but I added another.
>
> ----------------------------------------------------------------------------
>
> 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/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
> (see below).
>
Just FYI:
Yesterday and today, I had the same problem when applying the
linux-next single patch (see attached ErrMsg text file).
I am using a slightly modified kernel-buildsystem from Debian Kernel
Team (so not building out of a GIT repository).
The GNU/patch I have installed from Debian/sid does not include
symlink-support for git-diff [1].
Jonathan gave me the pointer to install patch package from Debian/experimental.
After reading its Changelog [2] and Debian-bug #243309 [3] I installed
the recommended version.
Indeed, it fixes the issue.
Cristoph, can we have a backport of [1] to patch/sid?
Thanks Jonathan!
- Sedat -
[1] http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f9db7450fa2788377c4567b5d0565b0ddfc1015c
[2] http://packages.debian.org/changelogs/pool/main/p/patch/patch_2.6.1.85-423d-3/changelog
[3] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=243309
[-- Attachment #2: ErrMsg_linux-next-patch-did-not-apply.txt --]
[-- Type: text/plain, Size: 4455 bytes --]
[ patch-v3.1-rc2-next-20110818 ]
...
diff --git a/tools/power/cpupower/debug/x86_64/Makefile b/tools/power/cpupower/debug/x86_64/Makefile
index dbf1399..3326217 100644
--- a/tools/power/cpupower/debug/x86_64/Makefile
+++ b/tools/power/cpupower/debug/x86_64/Makefile
@@ -1,10 +1,10 @@
default: all
-centrino-decode: centrino-decode.c
- $(CC) $(CFLAGS) -o centrino-decode centrino-decode.c
+centrino-decode: ../i386/centrino-decode.c
+ $(CC) $(CFLAGS) -o $@ $<
-powernow-k8-decode: powernow-k8-decode.c
- $(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c
+powernow-k8-decode: ../i386/powernow-k8-decode.c
+ $(CC) $(CFLAGS) -o $@ $<
all: centrino-decode powernow-k8-decode
diff --git a/tools/power/cpupower/debug/x86_64/centrino-decode.c b/tools/power/cpupower/debug/x86_64/centrino-decode.c
deleted file mode 120000
index 26fb3f1..0000000
--- a/tools/power/cpupower/debug/x86_64/centrino-decode.c
+++ /dev/null
@@ -1 +0,0 @@
-../i386/centrino-decode.c
\ No newline at end of file
diff --git a/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c b/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
deleted file mode 120000
index eb30c79..0000000
--- a/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
+++ /dev/null
@@ -1 +0,0 @@
-../i386/powernow-k8-decode.c
\ No newline at end of file
...
$ LC_ALL=C fakeroot make -f debian/rules.gen setup_i386_none_686-small 2>&1 | tee ../setup.log
make -f debian/rules.real setup-flavour ABINAME='-next20110818.3' ARCH='i386' COMPILER='gcc-4.6' FEATURESET='none' FLAVOUR='686-small' KCONFIG='debian/config/config debian/config/kernelarch-x86/config debian/config/kernelarch-x86/config-arch-32 debian/config/i386/none/config.686-iniza debian/config/custom-x86/config-debug debian/config/custom-x86/config-fs debian/config/custom-x86/config-infiniband debian/config/custom-x86/config-isa debian/config/custom-x86/config-isdn debian/config/custom-x86/config-multimedia debian/config/custom-x86/config-pseudofs debian/config/custom-x86/config-staging debian/config/i386/none/config.686-small' KERNEL_ARCH='x86' LOCALVERSION='-686-small' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-686-small' MODULES='True' SOURCEVERSION='3.1.0~rc2-1~next20110818.dileks3' TYPE='plain' UPSTREAMVERSION='3.1.0-rc2' VERSION='3.1.0'
make[1]: Entering directory `/mnt/sdb3/linux-kernel/linux-3.1-rc2'
rm -rf 'debian/build/source'
mkdir -p 'debian/build/source'
cp -al COPYING CREDITS Documentation Kbuild Kconfig MAINTAINERS Makefile README REPORTING-BUGS arch block crypto drivers firmware fs include init ipc kernel lib mm net samples scripts security sound tools usr virt .gitignore .mailmap 'debian/build/source'
cd 'debian/build/source'; python '/mnt/sdb3/linux-kernel/linux-3.1-rc2/debian/bin/patch.apply' --overwrite-home='/mnt/sdb3/linux-kernel/linux-3.1-rc2/debian/patches'
Warning: No version.Debian file, assuming Debian Linux 3.1.0~rc2
1 out of 1 hunk FAILED -- saving rejects to file tools/power/cpupower/debug/x86_64/centrino-decode.c.rej
1 out of 1 hunk FAILED -- saving rejects to file tools/power/cpupower/debug/x86_64/powernow-k8-decode.c.rej
Error: Patch failed
--> Try to apply base.
(+) FAIL linux-next/patch-v3.1-rc2-next-20110818
make[1]: *** [debian/stamps/source] Error 1
make[1]: Leaving directory `/mnt/sdb3/linux-kernel/linux-3.1-rc2'
make: *** [setup_i386_none_686-small_real] Error 2
-dileks // 18-Aug-2011
^ permalink raw reply related
* Re: linux-next: build warning after merge of the moduleh tree
From: Stephen Rothwell @ 2011-08-18 9:27 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Paul Gortmaker, linux-next, linux-kernel
In-Reply-To: <201108181026.51813.rjw@sisk.pl>
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
Hi Rafael,
On Thu, 18 Aug 2011 10:26:51 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> Do you mean that drivers/base/power/common.c should include module.h
> or something else?
Yes, that is exactly what I mean :-) See Rule 1 in
Documentation/SubmitChecklist. The reason it is different, is because
the module.h splitup is cerating export.h for files that just need
EXPORT_SYMBOL (like this file).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: error while fetching the unicore32 tree
From: Stephen Rothwell @ 2011-08-18 9:23 UTC (permalink / raw)
To: gxt; +Cc: Xuetao Guan, linux-next, linux-kernel
In-Reply-To: <1313650677.2905.7.camel@epip-laptop>
[-- Attachment #1: Type: text/plain, Size: 432 bytes --]
Hi,
On Thu, 18 Aug 2011 14:57:57 +0800 Guan Xuetao <gxt@mprc.pku.edu.cn> wrote:
>
> I have changed unicore32 pathname from linux-2.6-unicore32.git to
> linux-unicore.git
> Please change unicore32 git repo to:
> git://master.kernel.org/pub/scm/linux/kernel/git/epip/linux-unicore.git#unicore32
OK, I have updated.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the moduleh tree
From: Rafael J. Wysocki @ 2011-08-18 8:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Paul Gortmaker, linux-next, linux-kernel
In-Reply-To: <20110818150945.b429ef302fd45a6a309b52d4@canb.auug.org.au>
Hi,
On Thursday, August 18, 2011, Stephen Rothwell wrote:
> Hi Paul,
>
> After merging the moduleh tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> drivers/base/power/common.c:51:1: warning: data definition has no type or storage class
> drivers/base/power/common.c:51:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/common.c:51:1: warning: parameter names (without types) in function declaration
> drivers/base/power/common.c:85:1: warning: data definition has no type or storage class
> drivers/base/power/common.c:85:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
> drivers/base/power/common.c:85:1: warning: parameter names (without types) in function declaration
>
> Caused by the interaction of the module.h split up with commit
> 616d5814c605 ("PM: Reference counting of power.subsys_data") from the pm
> tree.
>
> I added this patch for today (Rafael, in your tree this needs to include
> module.h) and will carry it as necessary:
Do you mean that drivers/base/power/common.c should include module.h
or something else?
Rafael
^ permalink raw reply
* Re: linux-next: error while fetching the unicore32 tree
From: Guan Xuetao @ 2011-08-18 6:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Xuetao Guan, linux-next, linux-kernel
In-Reply-To: <20110818112247.2b2f302ac633ee7ca394545c@canb.auug.org.au>
On Thu, 2011-08-18 at 11:22 +1000, Stephen Rothwell wrote:
> Hi,
>
> While fetching the unicore32 tree, I get this error:
>
> fatal: '/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git' does not appear to be a git repository
>
> I will use the unicore32 tree from yesterday.
I'm sorry.
I have changed unicore32 pathname from linux-2.6-unicore32.git to
linux-unicore.git
Please change unicore32 git repo to:
git://master.kernel.org/pub/scm/linux/kernel/git/epip/linux-unicore.git#unicore32
Thanks Stephen, and sorry for the trouble.
Guan Xuetao
^ permalink raw reply
* linux-next: Tree for Aug 18
From: Stephen Rothwell @ 2011-08-18 6:00 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 15207 bytes --]
Hi all,
The powerpc allyesconfig build still fails today.
Changes since 20110817:
The sound-asoc tree lost its build failure.
The tip tree gained a conflict against Linus' tree.
The moduleh tree lost 2 of its merge fixups, but I added another.
----------------------------------------------------------------------------
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/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
(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 199 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.
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
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
Merging arm-soc/for-next
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Applying: xfs: fix tracing builds inside the source tree
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (delete/modify): drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c left in tree.
$ git rm -f drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging pm/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/of/base.c
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/Makefile
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
Applying: dm: use export.h instead of module.h where possible
CONFLICT (content): Merge conflict in drivers/md/persistent-data/dm-transaction-manager.c
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
$ git checkout akpm
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: This patch makes two changes:
Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex. It
Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
Applying: When no floppy is found the module code can be released while a timer
Applying: The parameter's origin type is long. On an i386 architecture, it can
Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Cc: Ed Wildgoose <git@wildgooses.com>
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: The x86 timer interrupt handler is the only handler not traced in the
Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: Some messing with error codes to return 0 on out id's and match
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: hwmon was using an idr with a NULL pointer, so convert to an
Applying: A straightforward looking use of idr for a device id.
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Add new check (assert_init) to make sure objects are initialized and
Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: Some mangling of errors was necessary to maintain current interface.
Applying: This does involve additional use of the spin lock in idr.c. Is this an
Applying: Instead of open coding this function use kstrtoul_from_user() directly.
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: The basic idea behind cross memory attach is to allow MPI programs doing
Applying: - Add x86_64 specific wire up
Applying: acct_isolated of compaction uses page_lru_base_type which returns only
Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
Applying: unmap_and_move() is one a big messy function. Clean it up.
Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
Applying: per-task block plug can reduce block queue lock contention and increase
Applying: The tracing ring-buffer used this function briefly, but not anymore.
Applying: After selecting a task to kill, the oom killer iterates all processes and
Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applying: The current implementation of the /dev/hpet driver couples opening the
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: s/lib-/obj-/ for usercopy.o
Applying: After an "unexpected" reboot, I found this Oops in my logs:
Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
Applying: Add axis correction for HP EliteBook 2730p.
Applying: Add axis correction for HP EliteBook 8540w.
Applying: Add axis correction for HP ProBook 6555b.
Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Change exported functions to use the device given as parameter
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
Applying: don't include asm/msr.h
Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
Applying: One can get this information from minix/inode.c, but adding the
Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Applying: Force this on for -next/mm testing purposes.
Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
Applying: A default echo function has been provided so it is no longer an error when
Applying: This client driver allows you to use a GPIO pin as a source for PPS
Applying: remove unneeded cast of void*
Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
Merging akpm
Applying: do_mounts: remove __init_data from root_wait
Applying: PM: EXPORT_SYMBOL needs export.h
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: boot test failure (net tree)
From: David Miller @ 2011-08-18 5:53 UTC (permalink / raw)
To: sfr
Cc: netdev, linux-next, linux-kernel, jeffrey.t.kirsher, mikey,
torvalds, akpm
In-Reply-To: <20110818152214.661858a61496993aaef2c704@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Aug 2011 15:22:14 +1000
> Mikey asks: Will Dave take these updates if we get Acks from the
> maintainers? :-)
I'm more than happy to :-)
^ permalink raw reply
* Re: linux-next: boot test failure (net tree)
From: Jeff Kirsher @ 2011-08-18 5:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Michael Neuling, Linus,
Andrew Morton
In-Reply-To: <20110818152214.661858a61496993aaef2c704@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2308 bytes --]
On Wed, 2011-08-17 at 22:22 -0700, Stephen Rothwell wrote:
> Hi Dave,
>
> On Wed, 17 Aug 2011 10:50:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 16 Aug 2011 17:15:25 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Wed, 17 Aug 2011 10:01:46 +1000
> > >
> > > > In particular, CONFIG_TIGON3 newly depends on
> > > > CONFIG_NET_VENDOR_BROADCOM which will no be selected when doing a
> > > > "make oldconfig" from a working config.
> > >
> > > When you type "make oldconfig" with an existing .config it prompts you
> > > for those vendor guards, giving you ample opportunity to say yes to
> > > them.
> >
> > Which is a bit of a pain for automated systems. Ours does (essentially):
> >
> > yes '' | make oldconfig
> >
> > We really don't want to select every new config item that comes along.
>
> So, Mikey did a test for me (he was bitten by this today). Just one of
> the powerpc configs (pseries_defconfig which should, in theory, build a
> kernel that will boot on almost all our POWER server machines) loses all
> these drivers if you do a "make pseries_defconfig":
>
> -CONFIG_IBMVETH=y
> -CONFIG_PCNET32=y
> -CONFIG_E100=y
> -CONFIG_ACENIC=m
> -CONFIG_ACENIC_OMIT_TIGON_I=y
> -CONFIG_E1000=y
> -CONFIG_E1000E=y
> -CONFIG_BNX2=m
> -CONFIG_CHELSIO_T3=m
> -CONFIG_CHELSIO_T4=m
> -CONFIG_IXGBE=m
> -CONFIG_IXGB=m
> -CONFIG_S2IO=m
> -CONFIG_MYRI10GE=m
> -CONFIG_NETXEN_NIC=m
> -CONFIG_QLGE=m
> -CONFIG_BE2NET=m
>
> That is just one of our deconfigs ... there are over 400 defconfigs in
> the kernel and a lot of them will need to be updated.
>
> Mikey asks: Will Dave take these updates if we get Acks from the
> maintainers? :-)
>
I am open to the idea. I considered updating the the defconfig's, but
was not sure was the best way of doing the changes. I was not sure
making these changes in Dave's net-next tree would not upset the arch
maintainer's, especially if there is a better tree(s) for the changes.
I am in the finishing up the patches for drivers/net/ {FDDI, PPP, SLIP,
HIPPI, etc.) and since I started this change, I would sign-up for making
the defconfig changes if that helps.
Cheers,
Jeff
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: boot test failure (net tree)
From: Stephen Rothwell @ 2011-08-18 5:22 UTC (permalink / raw)
To: David Miller
Cc: netdev, linux-next, linux-kernel, jeffrey.t.kirsher,
Michael Neuling, Linus, Andrew Morton
In-Reply-To: <20110817105002.efebf85d08460ad99b14be8e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1726 bytes --]
Hi Dave,
On Wed, 17 Aug 2011 10:50:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 16 Aug 2011 17:15:25 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 17 Aug 2011 10:01:46 +1000
> >
> > > In particular, CONFIG_TIGON3 newly depends on
> > > CONFIG_NET_VENDOR_BROADCOM which will no be selected when doing a
> > > "make oldconfig" from a working config.
> >
> > When you type "make oldconfig" with an existing .config it prompts you
> > for those vendor guards, giving you ample opportunity to say yes to
> > them.
>
> Which is a bit of a pain for automated systems. Ours does (essentially):
>
> yes '' | make oldconfig
>
> We really don't want to select every new config item that comes along.
So, Mikey did a test for me (he was bitten by this today). Just one of
the powerpc configs (pseries_defconfig which should, in theory, build a
kernel that will boot on almost all our POWER server machines) loses all
these drivers if you do a "make pseries_defconfig":
-CONFIG_IBMVETH=y
-CONFIG_PCNET32=y
-CONFIG_E100=y
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
-CONFIG_BNX2=m
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_IXGBE=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_MYRI10GE=m
-CONFIG_NETXEN_NIC=m
-CONFIG_QLGE=m
-CONFIG_BE2NET=m
That is just one of our deconfigs ... there are over 400 defconfigs in
the kernel and a lot of them will need to be updated.
Mikey asks: Will Dave take these updates if we get Acks from the
maintainers? :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the moduleh tree
From: Stephen Rothwell @ 2011-08-18 5:09 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Rafael J. Wysocki
Hi Paul,
After merging the moduleh tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
drivers/base/power/common.c:51:1: warning: data definition has no type or storage class
drivers/base/power/common.c:51:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/common.c:51:1: warning: parameter names (without types) in function declaration
drivers/base/power/common.c:85:1: warning: data definition has no type or storage class
drivers/base/power/common.c:85:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/base/power/common.c:85:1: warning: parameter names (without types) in function declaration
Caused by the interaction of the module.h split up with commit
616d5814c605 ("PM: Reference counting of power.subsys_data") from the pm
tree.
I added this patch for today (Rafael, in your tree this needs to include
module.h) and will carry it as necessary:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Aug 2011 15:06:10 +1000
Subject: [PATCH] PM: EXPORT_SYMBOL needs export.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/base/power/common.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index 1f58cf0..5b86d84 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -8,6 +8,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/export.h>
#include <linux/slab.h>
#include <linux/pm_clock.h>
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related
* linux-next: manual merge of the tip tree with the tree
From: Stephen Rothwell @ 2011-08-18 4:14 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Randy Dunlap, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/mm/fault.c between commit cedf03bd9aa5 ("x86: fix mm/fault.c
build") from Linus' tree and commit fab1167c4698 ("x86, vsyscall: Add
missing <asm/fixmap.h> to arch/x86/mm/fault.c") from the tip tree.
These are both fixing the same problem but differently. Given the
comments in the latter, I have used its version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH] evm: add MAINTAINERS entry
From: James Morris @ 2011-08-18 2:59 UTC (permalink / raw)
To: Mimi Zohar
Cc: linux-security-module, linux-next, linux-kernel, Stephen Rothwell,
Randy Dunlap, David Safford, Mimi Zohar
In-Reply-To: <1313621544-9239-1-git-send-email-zohar@linux.vnet.ibm.com>
On Wed, 17 Aug 2011, Mimi Zohar wrote:
> Update the MAINTAINERS file with an entry for EVM.
>
> Reported-by: Randy Dunlap <rdunlap@xenotimenet>
> Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* Re: [PATCH] evm: add Kconfig TCG_TPM dependency
From: James Morris @ 2011-08-18 2:58 UTC (permalink / raw)
To: Mimi Zohar
Cc: linux-security-module, linux-next, linux-kernel, Stephen Rothwell,
Randy Dunlap, David Safford, Mimi Zohar
In-Reply-To: <1313621496-8308-1-git-send-email-zohar@linux.vnet.ibm.com>
On Wed, 17 Aug 2011, Mimi Zohar wrote:
> Although the EVM encrypted-key should be encrypted/decrypted using a
> trusted-key, a user-defined key could be used instead. When using a user-
> defined key, a TCG_TPM dependency should not be required. Unfortunately,
> the encrypted-key code needs to be refactored a bit in order to remove
> this dependency.
>
> This patch adds the TCG_TPM dependency.
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* linux-next: error while fetching the unicore32 tree
From: Stephen Rothwell @ 2011-08-18 1:22 UTC (permalink / raw)
To: Xuetao Guan; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
Hi,
While fetching the unicore32 tree, I get this error:
fatal: '/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git' does not appear to be a git repository
I will use the unicore32 tree from yesterday.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* [PATCH] evm: add MAINTAINERS entry
From: Mimi Zohar @ 2011-08-17 22:52 UTC (permalink / raw)
To: linux-security-module
Cc: Mimi Zohar, linux-next, linux-kernel, James Morris,
Stephen Rothwell, Randy Dunlap, David Safford, Mimi Zohar
Update the MAINTAINERS file with an entry for EVM.
Reported-by: Randy Dunlap <rdunlap@xenotimenet>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
MAINTAINERS | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 51d42fb..02a60b8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2555,6 +2555,11 @@ S: Maintained
F: Documentation/filesystems/ext4.txt
F: fs/ext4/
+Extended Verification Module (EVM)
+M: Mimi Zohar <zohar@us.ibm.com>
+S: Supported
+F: security/integrity/evm/
+
F71805F HARDWARE MONITORING DRIVER
M: Jean Delvare <khali@linux-fr.org>
L: lm-sensors@lm-sensors.org
--
1.7.3.4
^ permalink raw reply related
* [PATCH] evm: add Kconfig TCG_TPM dependency
From: Mimi Zohar @ 2011-08-17 22:51 UTC (permalink / raw)
To: linux-security-module
Cc: Mimi Zohar, linux-next, linux-kernel, James Morris,
Stephen Rothwell, Randy Dunlap, David Safford, Mimi Zohar
Although the EVM encrypted-key should be encrypted/decrypted using a
trusted-key, a user-defined key could be used instead. When using a user-
defined key, a TCG_TPM dependency should not be required. Unfortunately,
the encrypted-key code needs to be refactored a bit in order to remove
this dependency.
This patch adds the TCG_TPM dependency.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>,
Randy Dunlap <rdunlap@xenotimenet>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
security/integrity/evm/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig
index 444877d..884617d 100644
--- a/security/integrity/evm/Kconfig
+++ b/security/integrity/evm/Kconfig
@@ -1,6 +1,6 @@
config EVM
boolean "EVM support"
- depends on SECURITY && KEYS
+ depends on SECURITY && KEYS && TCG_TPM
select CRYPTO_HMAC
select CRYPTO_MD5
select CRYPTO_SHA1
--
1.7.3.4
^ permalink raw reply related
* Re: linux-next: Tree for Aug 17 (EVM)
From: Mimi Zohar @ 2011-08-17 17:00 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, Mimi Zohar, Kylene Hall, linux-next, LKML,
James Morris, linux-security-module
In-Reply-To: <20110817094039.0bba7092.rdunlap@xenotime.net>
On Wed, 2011-08-17 at 09:40 -0700, Randy Dunlap wrote:
> On Wed, 17 Aug 2011 15:16:28 +1000 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > The powerpc allyesconfig build still fails today.
>
> warning: (EVM) selects TRUSTED_KEYS which has unmet direct dependencies (KEYS && TCG_TPM)
>
> EVM should depend on TCG_TPM [or select it :( ].
Thanks Randy for bringing this to my attention. It's preferable to use
a trusted key to encrypt/decrypt the EVM key, but for those systems
without a TPM, user type keys are supported. I'll add the dependency
for now, but will look into a better solution.
> Can we get an EVM entry added to MAINTAINERS, please?
>
> ---
> ~Randy
Will do.
thanks,
Mimi
^ permalink raw reply
* Re: linux-next: Tree for Aug 17 (EVM)
From: Randy Dunlap @ 2011-08-17 16:40 UTC (permalink / raw)
To: Stephen Rothwell, Mimi Zohar, Kylene Hall
Cc: linux-next, LKML, James Morris, linux-security-module
In-Reply-To: <20110817151628.93911903cac8f207e9f01457@canb.auug.org.au>
On Wed, 17 Aug 2011 15:16:28 +1000 Stephen Rothwell wrote:
> Hi all,
>
> The powerpc allyesconfig build still fails today.
warning: (EVM) selects TRUSTED_KEYS which has unmet direct dependencies (KEYS && TCG_TPM)
EVM should depend on TCG_TPM [or select it :( ].
Can we get an EVM entry added to MAINTAINERS, please?
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next blackfin builds
From: Stephen Rothwell @ 2011-08-17 6:22 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-next, uclinux-dist-devel
In-Reply-To: <20110812131750.73f1257494fd7dad45c96131@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1151 bytes --]
Hi Mike,
On Fri, 12 Aug 2011 13:17:50 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 11 Aug 2011 21:50:09 -0400 Mike Frysinger <vapier.adi@gmail.com> wrote:
> >
> > the linux-next website doesnt seem to cover the build system other
> > than to link to it. all Blackfin defconfigs should be buildable, and
> > are in fact being built right now on a nightly basis on ADI systems.
> > is there a way to plug those results into the site ?
>
> For a long time we didn't have a blackfin cross compiler that worked. We
> are working on building one and when that is done, I will add the
> blackfin configs the our build set (and the results will be on the kisskb
> site).
I have found a compiler (gcc 4.4.0, no libc) that seem to work. You can
see the results here: http://kisskb.ellerman.id.au/kisskb/branch/9/ .
Of course, some of the build errors may be due to the tool chain, I guess.
I have also added a BF537-STAMP_defconfig build for Linus' tree
(http://kisskb.ellerman.id.au/kisskb/branch/3/).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: Tree for Aug 17
From: Stephen Rothwell @ 2011-08-17 5:16 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 15210 bytes --]
Hi all,
The powerpc allyesconfig build still fails today.
Changes since 20110816:
The sound-asoc tree gained a build failure for which I revertetd a commit.
The net tree lost its build failures.
The moduleh tree lost a conflict.
----------------------------------------------------------------------------
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/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
(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 199 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.
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
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
Merging arm-soc/for-next
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Applying: xfs: fix tracing builds inside the source tree
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (delete/modify): drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c left in tree.
$ git rm -f drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging pm/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/of/base.c
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/Makefile
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: power: max8998_charger.c needs module.h
Applying: power_supply: max8997_charger.c need to include module.h
$ git checkout akpm
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: This patch makes two changes:
Applying: On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex. It
Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
Applying: When no floppy is found the module code can be released while a timer
Applying: The parameter's origin type is long. On an i386 architecture, it can
Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Cc: Ed Wildgoose <git@wildgooses.com>
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: The x86 timer interrupt handler is the only handler not traced in the
Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: Some messing with error codes to return 0 on out id's and match
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: hwmon was using an idr with a NULL pointer, so convert to an
Applying: A straightforward looking use of idr for a device id.
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Add new check (assert_init) to make sure objects are initialized and
Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: Some mangling of errors was necessary to maintain current interface.
Applying: This does involve additional use of the spin lock in idr.c. Is this an
Applying: Instead of open coding this function use kstrtoul_from_user() directly.
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: The basic idea behind cross memory attach is to allow MPI programs doing
Applying: - Add x86_64 specific wire up
Applying: acct_isolated of compaction uses page_lru_base_type which returns only
Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
Applying: unmap_and_move() is one a big messy function. Clean it up.
Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
Applying: per-task block plug can reduce block queue lock contention and increase
Applying: The tracing ring-buffer used this function briefly, but not anymore.
Applying: After selecting a task to kill, the oom killer iterates all processes and
Applying: Remove PageSwapBacked (!page_is_file_cache) cases from
Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applying: The current implementation of the /dev/hpet driver couples opening the
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: s/lib-/obj-/ for usercopy.o
Applying: After an "unexpected" reboot, I found this Oops in my logs:
Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
Applying: Add axis correction for HP EliteBook 2730p.
Applying: Add axis correction for HP EliteBook 8540w.
Applying: Add axis correction for HP ProBook 6555b.
Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Change exported functions to use the device given as parameter
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
Applying: don't include asm/msr.h
Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
Applying: One can get this information from minix/inode.c, but adding the
Applying: Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Applying: Force this on for -next/mm testing purposes.
Applying: Add a proc_dointvec_bool() sysctl handler for cases where the input value
Applying: Use the new proc_do_intvec_bool() handler for various boolean inputs.
Applying: Add a proc_dointvec_unsigned() sysctl handler for positive value cases.
Applying: Cc: Alexey Dobriyan <adobriyan@gmail.com>
Applying: Use the new proc_do_intvec_unsigned() handler for various unsigned inputs.
Applying: A default echo function has been provided so it is no longer an error when
Applying: This client driver allows you to use a GPIO pin as a source for PPS
Applying: remove unneeded cast of void*
Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
Merging akpm
Applying: do_mounts: remove __init_data from root_wait
[master d56e62a] Revert "ASoC: Implement WM8994 thermal warning and shutdown interrupt support"
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (sound-asoc tree related)
From: Stephen Rothwell @ 2011-08-17 4:21 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
Hi Mark,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
sound/soc/codecs/wm8994.c: In function 'wm8994_codec_probe':
sound/soc/codecs/wm8994.c:3144:27: error: 'struct wm8994_priv' has no member named 'wm8994'
sound/soc/codecs/wm8994.c:3146:27: error: 'struct wm8994_priv' has no member named 'wm8994'
Caused by commit f0b182b003e2 ("ASoC: Implement WM8994 thermal warning
and shutdown interrupt support").
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: boot test failure (net tree)
From: David Miller @ 2011-08-17 3:05 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, jeffrey.t.kirsher
In-Reply-To: <20110817112110.ec81ef078204bf4a02049a66@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Aug 2011 11:21:10 +1000
> On Tue, 16 Aug 2011 17:56:57 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>>
>> This happens on other occaisions, I see new group guards all
>> the time when I resync my net and net-next trees with Linus.
>
> "All the time"? really?
I can't think of too many days during the merge window where this
doesn't happen, quite frankly.
^ permalink raw reply
* Re: linux-next: boot test failure (net tree)
From: David Miller @ 2011-08-17 3:04 UTC (permalink / raw)
To: bhutchings; +Cc: sfr, netdev, linux-next, linux-kernel, jeffrey.t.kirsher
In-Reply-To: <1313543952.2981.132.camel@deadeye>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 17 Aug 2011 02:19:12 +0100
> If you were to use just "yes", then of course it would. But since there
> is no explicit default, "yes ''" will deselect them.
>
> Maybe these guards should have "default y"?
The point is to declutter xconfig and friends, if it defaults to
'y' everything will just always expand.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox