* Re: linux-next tree addition request (fbdev)
From: Stephen Rothwell @ 2011-08-24 14:33 UTC (permalink / raw)
To: Florian Tobias Schandinat
Cc: linux-next, linux-fbdev@vger.kernel.org, Paul Mundt
In-Reply-To: <4E54FF5E.5050308@gmx.de>
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
Hi Florian,
On Wed, 24 Aug 2011 13:40:46 +0000 Florian Tobias Schandinat <FlorianSchandinat@gmx.de> wrote:
>
> can you please add
>
> git://github.com/schandinat/linux-2.6.git fbdev-next
>
> to linux-next. It collects patches for the frame buffer subsystem.
> Can you please add the linux-fbdev@vger.kernel.org mailing list as additional
> contact for warnings/errors/problems?
>
> You probably want to drop Paul's fbdev branches as they contain some outdated
> patches that will conflict with the newer versions.
OK, Paul is still listed as the frame buffer subsystem maintainer, so I
will need an Ack from him. When I get that, I will replace his tree with
yours. I assume someone will update the MAINTAINERS file.
I also have another tree from Paul (called fbdev-current) that contained
fixes for Linus' current release. I also assume that that tree will be
dropped (unless you have a new version of that as well).
--
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 addition request (fbdev)
From: Florian Tobias Schandinat @ 2011-08-24 13:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-fbdev@vger.kernel.org, Paul Mundt
Hi Stephen,
can you please add
git://github.com/schandinat/linux-2.6.git fbdev-next
to linux-next. It collects patches for the frame buffer subsystem.
Can you please add the linux-fbdev@vger.kernel.org mailing list as additional
contact for warnings/errors/problems?
You probably want to drop Paul's fbdev branches as they contain some outdated
patches that will conflict with the newer versions.
Thanks,
Florian Tobias Schandinat
^ permalink raw reply
* Re: linux-next: build warning after merge of the rcu tree
From: Paul E. McKenney @ 2011-08-24 12:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20110824142337.78715e4d6f9db2de68d87fe4@canb.auug.org.au>
On Wed, Aug 24, 2011 at 02:23:37PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> After merging the rcu tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> kernel/rtmutex.c: In function '__rt_mutex_slowlock':
> kernel/rtmutex.c:605:3: warning: suggest parentheses around assignment used as truth value
There actually already are parentheses around it, and the first pass
through the loop it is uninitialized at that point. But hey, that
is gcc for you! Does the patch below cure it?
> Introduced by commit 83841f021d4b ("rcu: Permit rt_mutex_unlock() with
> irqs disabled").
If it does, then I will fold into that commit.
Thanx, Paul
------------------------------------------------------------------------
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index 0222e34..2548f44 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -602,7 +602,8 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
raw_spin_unlock(&lock->wait_lock);
- if (was_disabled = irqs_disabled())
+ was_disabled = irqs_disabled();
+ if (was_disabled)
local_irq_enable();
debug_rt_mutex_print_deadlock(waiter);
^ permalink raw reply related
* Re: linux next: Native Linux KVM tool inclusion request
From: Pekka Enberg @ 2011-08-24 9:38 UTC (permalink / raw)
To: Avi Kivity
Cc: Christoph Hellwig, Sasha Levin, Stephen Rothwell, linux-kernel,
Ingo Molnar, Andrew Morton, Linus Torvalds, linux-next
In-Reply-To: <4E54C55A.7010109@redhat.com>
On 8/24/11 12:33 PM, Avi Kivity wrote:
> Well, just trashing /home/penberg would be bad too, no? (my recent
> experience indicates it's not that catastrophic - anything important
> sits on a server somewhere and the local data is just a cache).
Sure. We actually are planning something like this:
Private to guest:
/dev
/etc
/home
/proc
/sys
/var
Shared from host rootfs:
/bin
/lib
/sbin
/usr
Full host rootfs mounted at:
/host/
And no, we're not planning to boot full distro init. The only thing we
really want in addition to /bin/sh is to enable networking.
Pekka
^ permalink raw reply
* Re: linux next: Native Linux KVM tool inclusion request
From: Avi Kivity @ 2011-08-24 9:33 UTC (permalink / raw)
To: Pekka Enberg
Cc: Christoph Hellwig, Sasha Levin, Stephen Rothwell, linux-kernel,
Ingo Molnar, Andrew Morton, Linus Torvalds, linux-next
In-Reply-To: <4E54C210.1030204@kernel.org>
On 08/24/2011 12:19 PM, Pekka Enberg wrote:
> On 8/24/11 11:31 AM, Avi Kivity wrote:
>> On 08/23/2011 08:08 AM, Pekka Enberg wrote:
>>> As for changes, we've implemented rootfs over 9p with "kvm run"
>>> booting to host filesystem "/bin/sh" by default.
>>
>> Isn't this dangerous? Users expect virtualization to land them in
>> sandbox, but here an rm -rf / in the guest will happily junk the host
>> filesystem.
>
> Not really because I never run the tool as root. However, you're right
> that
> we should not default to /bin/sh if you're root.
Well, just trashing /home/penberg would be bad too, no? (my recent
experience indicates it's not that catastrophic - anything important
sits on a server somewhere and the local data is just a cache).
>>
>> Still dangerous (but just to the guest), since it's not a true
>> snapshot. If the host filesystem changes underneath the guest, it
>> will see partial and incoherent updates. Copy-on-write only works if
>> the host filesystem doesn't change.
>
> That's a generic problem with overlayfs based solutions, isn't it?
> We're planning
> to use copy-on-write only on files that aren't supposed to change that
> often -
> like /usr and /lib.
So the guest won't see bad data that often?
Overlay works fine if the host tree is readonly. So if you have a
separate tree for guests, you can share it with any number of them.
Just don't share the host root.
Note this probably isn't a problem booting to /bin/bash, just booting a
full-featured guest with package management and other database-like apps
that expect exclusive control over their data.
> I suppose we should force shared files to be read-only in
> the guest.
>
Yes, that's safer.
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
^ permalink raw reply
* Re: linux next: Native Linux KVM tool inclusion request
From: Pekka Enberg @ 2011-08-24 9:19 UTC (permalink / raw)
To: Avi Kivity
Cc: Christoph Hellwig, Sasha Levin, Stephen Rothwell, linux-kernel,
Ingo Molnar, Andrew Morton, Linus Torvalds, linux-next
In-Reply-To: <4E54B6E2.2030203@redhat.com>
On 8/24/11 11:31 AM, Avi Kivity wrote:
> On 08/23/2011 08:08 AM, Pekka Enberg wrote:
>> As for changes, we've implemented rootfs over 9p with "kvm run"
>> booting to host filesystem "/bin/sh" by default.
>
> Isn't this dangerous? Users expect virtualization to land them in
> sandbox, but here an rm -rf / in the guest will happily junk the host
> filesystem.
Not really because I never run the tool as root. However, you're right that
we should not default to /bin/sh if you're root.
>> It still needs some
>> work and we hope to enable networking too. We also have patches to use
>> overlayfs so that the guest is able to use host filesystem in
>> copy-on-write manner.
>
> Still dangerous (but just to the guest), since it's not a true
> snapshot. If the host filesystem changes underneath the guest, it
> will see partial and incoherent updates. Copy-on-write only works if
> the host filesystem doesn't change.
That's a generic problem with overlayfs based solutions, isn't it? We're
planning
to use copy-on-write only on files that aren't supposed to change that
often -
like /usr and /lib. I suppose we should force shared files to be
read-only in
the guest.
Pekka
^ permalink raw reply
* Re: [PATCH -next v2] usb: fix dwc3 build when USB_GADGET_DWC3 is not enabled
From: Felipe Balbi @ 2011-08-24 8:51 UTC (permalink / raw)
To: Randy Dunlap
Cc: balbi, Stephen Rothwell, akpm, gregkh, linux-next, LKML,
linux-omap
In-Reply-To: <20110823125247.fbbf9636.rdunlap@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
Hi,
On Tue, Aug 23, 2011 at 12:52:47PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build error when CONFIG_USB_GADGET_DWC3 is not enabled:
>
> ERROR: "dwc3_send_gadget_ep_cmd" [drivers/usb/dwc3/dwc3.ko] undefined!
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks Randy
Acked-by: Felipe Balbi <balbi@ti.com>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux next: Native Linux KVM tool inclusion request
From: Avi Kivity @ 2011-08-24 8:31 UTC (permalink / raw)
To: Pekka Enberg
Cc: Christoph Hellwig, Sasha Levin, Stephen Rothwell, linux-kernel,
Ingo Molnar, Andrew Morton, Linus Torvalds, linux-next
In-Reply-To: <CAOJsxLEgm_-N6297kHqSjFLCtX-Vd204S=+4Q=+GW9HYiWj1eg@mail.gmail.com>
On 08/23/2011 08:08 AM, Pekka Enberg wrote:
> As for changes, we've implemented rootfs over 9p with "kvm run"
> booting to host filesystem "/bin/sh" by default.
Isn't this dangerous? Users expect virtualization to land them in
sandbox, but here an rm -rf / in the guest will happily junk the host
filesystem.
> It still needs some
> work and we hope to enable networking too. We also have patches to use
> overlayfs so that the guest is able to use host filesystem in
> copy-on-write manner.
>
Still dangerous (but just to the guest), since it's not a true
snapshot. If the host filesystem changes underneath the guest, it will
see partial and incoherent updates. Copy-on-write only works if the
host filesystem doesn't change.
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
^ permalink raw reply
* linux-next: Tree for Aug 24
From: Stephen Rothwell @ 2011-08-24 6:04 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 16194 bytes --]
Hi all,
The powerpc allyesconfig build still fails today.
Changes since 20110823:
New tree: kvmtool
The security tree lost its build failure.
The ptrace tree gained a build failure (yeaterday) for which I have
reveretd a commit.
The tty tree gained a build failure so I used the version from
next-20110823.
The staging tree gained a conflict against the fbdev tree and a build
failure for which I reverted a commit.
The moduleh tree gained a conflict against the staging tree.
----------------------------------------------------------------------------
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
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
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in drivers/net/Makefile
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Applying: powerpc: update ppc64_defconfig for net device movement
Applying: sparc: update sparc32_defconfig for net device movement
Applying: sparc: update sparc64_defconfig for net device movement
Merging wireless/master
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
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
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
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
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
[master 12688b4] Revert "signal: Add block_sigmask() for adding sigmask to current->blocked"
Merging xen/upstream/xen
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
$ git reset --hard HEAD^
Merging refs/next/20110823/tty
Merging usb/usb-next
Applying: usb: include module.h in the DesignWare USB3 DRD driver
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in drivers/staging/iio/accel/adis16220_core.c
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: PM: EXPORT_SYMBOL needs export.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ 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 9cba48a] Revert "Staging: add driver for Realtek RTS5139 cardreader"
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (staging tree related)
From: Stephen Rothwell @ 2011-08-24 5:47 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, edwin_rong
[-- Attachment #1: Type: text/plain, Size: 1032 bytes --]
Hi ,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/staging/rts5139/rts51x_scsi.c: In function 'inquiry':
drivers/staging/rts5139/rts51x_scsi.c:498:2: error: implicit declaration of function 'vmalloc'
drivers/staging/rts5139/xd.c: In function 'xd_init_l2p_tbl':
drivers/staging/rts5139/xd.c:745:2: error: implicit declaration of function 'vmalloc'
drivers/staging/rts5139/xd.c: In function 'free_zone':
drivers/staging/rts5139/xd.c:771:3: error: implicit declaration of function 'vfree'
drivers/staging/rts5139/ms.c: In function 'ms_init_l2p_tbl':
drivers/staging/rts5139/ms.c:2214:2: error: implicit declaration of function 'vmalloc'
drivers/staging/rts5139/ms.c:2257:3: error: implicit declaration of function 'vfree'
Caused by commit 1dac4186bcc6 ("Staging: add driver for Realtek RTS5139
cardreader").
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
* linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell @ 2011-08-24 5:00 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Jonathan Cameron, Greg KH
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/accel/adis16220_core.c between commit 7991029a55fa
("staging:iio:accel:adis16220 iio_chan_spec conversion") from the staging
tree and commit dcf6be043de1 ("staging: Add module.h to drivers/staging
users") from the moduleh tree.
Just context changes. I have fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/iio/accel/adis16220_core.c
index 075e40f,e119874..0000000
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@@ -13,6 -16,8 +13,7 @@@
#include <linux/spi/spi.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
-#include <linux/list.h>
+ #include <linux/module.h>
#include "../iio.h"
#include "../sysfs.h"
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the fbdev tree
From: Greg KH @ 2011-08-24 4:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Aaro Koskinen, Laurent Pinchart,
Paul Mundt
In-Reply-To: <20110824144134.00bd3a688fb39b5d5563ff13@canb.auug.org.au>
On Wed, Aug 24, 2011 at 02:41:34PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/xgifb/XGI_main_26.c between commit c42a3d543d2b
> ("staging: xgifb: use display information in info not in var for
> panning") from the fbdev tree and commit c39aada6926c ("staging: xgifb:
> eliminate #ifdef XGIFB_PAN") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Wonderful, thanks for the fix.
greg k-h
^ permalink raw reply
* Re: linux-next: build failure after merge of the tty tree
From: Greg KH @ 2011-08-24 4:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jamie Iles, Arnd Bergmann
In-Reply-To: <20110824143354.d32c86b5143631442aca3700@canb.auug.org.au>
On Wed, Aug 24, 2011 at 02:33:54PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/built-in.o: In function `dw8250_handle_irq':
> 8250_dw.c:(.text+0xcad9c): undefined reference to `serial8250_handle_irq'
>
> CONFIG_SERIAL_8250 is 'm' and CONFIG_SERIAL_8250_DW is 'y' ...
>
> Caused by commit 6b1a98d1c485 ("tty: serial8250: add helpers for the
> DesignWare 8250").
>
> I have used the ttye tree form next-20110823 for today.
Ick.
Jamie, can you please send me a patch that fixes this up?
thanks,
greg k-h
^ permalink raw reply
* linux-next: manual merge of the staging tree with the fbdev tree
From: Stephen Rothwell @ 2011-08-24 4:41 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Aaro Koskinen, Laurent Pinchart,
Paul Mundt
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/xgifb/XGI_main_26.c between commit c42a3d543d2b
("staging: xgifb: use display information in info not in var for
panning") from the fbdev tree and commit c39aada6926c ("staging: xgifb:
eliminate #ifdef XGIFB_PAN") from the staging tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/xgifb/XGI_main_26.c
index f8b88ad,4415d4a..0000000
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@@ -1363,8 -1357,7 +1357,7 @@@ static int XGIfb_do_set_var(struct fb_v
return 0;
}
- #ifdef XGIFB_PAN
-static int XGIfb_pan_var(struct fb_var_screeninfo *var)
+static int XGIfb_pan_var(struct fb_var_screeninfo *var, struct fb_info *info)
{
unsigned int base;
^ permalink raw reply
* Re: linux next: Native Linux KVM tool inclusion request
From: Sasha Levin @ 2011-08-24 4:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-kernel, Avi Kivity, Ingo Molnar, Andrew Morton,
Linus Torvalds, Pekka Enberg, linux-next, Christoph Hellwig
In-Reply-To: <20110824115233.4b515a6ceee8910e9c21fc50@canb.auug.org.au>
On Wed, 2011-08-24 at 11:52 +1000, Stephen Rothwell wrote:
> Hi Sasha,
>
> On Mon, 22 Aug 2011 23:29:20 +0300 Sasha Levin <levinsasha928@gmail.com> wrote:
> >
> > I would like to ask you to include the Native Linux KVM tool in the
> > linux-next tree.
> >
> > The branch is named 'master' and is located in:
> >
> > git://github.com/penberg/linux-kvm.git
>
> I have included your tree from today and called it "kvmtool". I have you
> and Pekka currently listed as teh contacts (since it looks like it is his
> tree on github). Please consider adding a MAINTAINERS entry for this.
>
> Thanks for adding your subsystem tree as a participant of linux-next. As
> you may know, this is not a judgment of your code. The purpose of
> linux-next is for integration testing and to lower the impact of
> conflicts between subsystems in the next merge window.
>
> You will need to ensure that the patches/commits in your tree/series have
> been:
> * submitted under GPL v2 (or later) and include the Contributor's
> Signed-off-by,
> * posted to the relevant mailing list,
> * reviewed by you (or another maintainer of your subsystem tree),
> * successfully unit tested, and
> * destined for the current or next Linux merge window.
>
> Basically, this should be just what you would send to Linus (or ask him
> to fetch). It is allowed to be rebased if you deem it necessary.
>
Thank you for the inclusion.
We will add a MAINTAINERS file.
--
Sasha.
^ permalink raw reply
* linux-next: build failure after merge of the tty tree
From: Stephen Rothwell @ 2011-08-24 4:33 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jamie Iles, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
Hi Greg,
After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/built-in.o: In function `dw8250_handle_irq':
8250_dw.c:(.text+0xcad9c): undefined reference to `serial8250_handle_irq'
CONFIG_SERIAL_8250 is 'm' and CONFIG_SERIAL_8250_DW is 'y' ...
Caused by commit 6b1a98d1c485 ("tty: serial8250: add helpers for the
DesignWare 8250").
I have used the ttye tree form next-20110823 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
* linux-next: build warning after merge of the rcu tree
From: Stephen Rothwell @ 2011-08-24 4:23 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
Hi Paul,
After merging the rcu tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
kernel/rtmutex.c: In function '__rt_mutex_slowlock':
kernel/rtmutex.c:605:3: warning: suggest parentheses around assignment used as truth value
Introduced by commit 83841f021d4b ("rcu: Permit rt_mutex_unlock() with
irqs disabled").
--
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
* [Patch] numa: introduce CONFIG_NUMA_SYSFS for drivers/base/node.c
From: Cong Wang @ 2011-08-24 3:34 UTC (permalink / raw)
To: Andrew Morton
Cc: Randy Dunlap, Stephen Rothwell, gregkh, linux-next, LKML,
linux-mm
In-Reply-To: <20110823143912.0691d442.akpm@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 77 bytes --]
Hi, Andrew,
Do you think my patch below is better?
Thanks!
------------->
[-- Attachment #2: numa-depends-on-sysfs.diff --]
[-- Type: text/plain, Size: 1334 bytes --]
Introduce a new Kconfig CONFIG_NUMA_SYSFS for drivers/base/node.c
which just provides sysfs interface, so that when we select
CONFIG_NUMA, we don't have to enable the sysfs interface too.
This by the way fixes a randconfig build error when NUMA && !SYSFS.
Signed-off-by: WANG Cong <amwang@redhat.com>
---
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 99a375a..e382338 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_HAS_DMA) += dma-mapping.o
obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
obj-$(CONFIG_ISA) += isa.o
obj-$(CONFIG_FW_LOADER) += firmware_class.o
-obj-$(CONFIG_NUMA) += node.o
+obj-$(CONFIG_NUMA_SYSFS) += node.o
obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
obj-$(CONFIG_SMP) += topology.o
ifeq ($(CONFIG_SYSFS),y)
diff --git a/mm/Kconfig b/mm/Kconfig
index f2f1ca1..77345e7 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -340,6 +340,16 @@ choice
benefit.
endchoice
+config NUMA_SYSFS
+ bool "Enable NUMA sysfs interface for user-space"
+ depends on NUMA
+ depends on SYSFS
+ default y
+ help
+ This enables NUMA sysfs interface, /sys/devices/system/node/*
+ files, for user-space tools, like numactl. If you have enabled
+ NUMA, probably you also need this one.
+
#
# UP and nommu archs use km based percpu allocator
#
^ permalink raw reply related
* Re: linux-next: Tree for Aug 22 (evm)
From: Arnaud Lacombe @ 2011-08-24 2:10 UTC (permalink / raw)
To: Randy Dunlap
Cc: Mimi Zohar, Stephen Rothwell, Mimi Zohar, linux-next, LKML,
linux-kbuild
In-Reply-To: <20110823164035.ca28fdc6.rdunlap@xenotime.net>
Hi,
On Tue, Aug 23, 2011 at 7:40 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> I think that you are going to need to do something like Arnaud suggested
> and use "depends on TCG_TPM=y" instead of just "depends on TCG_TPM",
> unless you can convince someone that this is a kconfig bug.
>
dammit... I guess there is...
If you consider the following Kconfig:
config MOD
bool
default y
option modules
config EXPERIMENTAL
bool
default y
menuconfig A
tristate "A"
depends on EXPERIMENTAL
config B
bool "B"
config B0
bool
config C
tristate "C"
depends on B
config C0
tristate
config D
boolean "D"
depends on A && B
select C
select C0
config E
tristate "E"
config F
tristate "F"
select E
B (KEYS) allows to set C (TRUSTED_KEYS). Also, B (KEYS) and A
(TCG_TPM) allows to set D (EVM), which will select (C). Now,
menuconfig highlight the problem very well. Proceeding as following
A=m, B=y, C=m, E=y, F=y, we ends up having:
<M> A --->
[*] B
{M} C
[*] D
-*- E
<*> F
which translate in the following config:
CONFIG_MOD=y
CONFIG_EXPERIMENTAL=y
CONFIG_A=m
CONFIG_B=y
CONFIG_C=m
CONFIG_C0=m
CONFIG_D=y
CONFIG_E=y
CONFIG_F=y
I would have expected CONFIG_C and CONFIG_C0 to be 'y', just as 'E'.
If you remove D's dependency on 'A', everything works as expected. So
it would seem direct dependency state influence the state of reverse
dependencies...
Will have a look...
- Arnaud
^ permalink raw reply
* Re: linux-next: Tree for Aug 22 (evm)
From: Mimi Zohar @ 2011-08-24 2:07 UTC (permalink / raw)
To: Arnaud Lacombe
Cc: Randy Dunlap, Stephen Rothwell, Mimi Zohar, linux-next, LKML,
linux-kbuild
In-Reply-To: <CACqU3MV-MfWxvVebcxiJK8BmxHG8epf=0bpsL7qoska65aVzSw@mail.gmail.com>
On Mon, 2011-08-22 at 22:24 -0400, Arnaud Lacombe wrote:
> Hi,
>
> On Mon, Aug 22, 2011 at 10:09 PM, Mimi Zohar <zohar@linux.vnet.ibm.com> wrote:
> > On Mon, 2011-08-22 at 17:49 -0700, Randy Dunlap wrote:
> >> On Mon, 22 Aug 2011 20:47:00 -0400 Arnaud Lacombe wrote:
> >>
> >> > Hi,
> >> >
> >> > On Mon, Aug 22, 2011 at 3:53 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> >> > > On Mon, 22 Aug 2011 14:53:04 +1000 Stephen Rothwell wrote:
> >> > >
> >> > >> Hi all,
> >> > >>
> >> > >> [The kernel.org mirroring is a bit low today]
> >> > >
> >> > > (on x86_64:)
> >> > >
> >> > > When CONFIG_EVM=y, CONFIG_CRYPTO_HASH2=m, CONFIG_TRUSTED_KEYS=m,
> >> > > CONFIG_ENCRYPTED_KEYS=m, the build fails with:
> >> > >
> >> > You did not provide the value of CONFIG_TCG_TPM, I'll assume it was
> >> > 'm'. That said, correct me if I'm wrong, but we currently have:
> >>
> >> Yes, it was 'm'.
> >>
> >> > menuconfig TCG_TPM
> >> > tristate "TPM Hardware Support"
> >> >
> >> > [...]
> >> >
> >> > config EVM
> >> > boolean "EVM support"
> >> > depends on SECURITY && KEYS && TCG_TPM
> >> >
> >> > which seems terribly broken to me... How can you have a built-in
> >> > feature, which depends on another potentially-not-built-in feature ?
> >>
> >> Yup.
> >
> > Easy, different use cases. The TPM has been around and used for a while,
> > not requiring it to be built-in. EVM, a new use case, requires it to be
> > built-in.
> >
> What behavior is expected when TPM is built as a module ? Would you
> expect EVM to be accessible ?
>
> >> > If you change EVM to 'tristate', you will see that you are not allowed
> >> > to make it built-in if TCG_TPM is not built-in.
> >>
> >> Right.
> >
> > The TPM, crypto, trusted and encrypted keys are tristate. Like the
> > LSMs, EVM is boolean, which when selected using 'make xconfig', converts
> > the tristates to built-in. The tristate/boolean mismatches aren't
> > corrected, when .config is edited directly.
> >
> well, ... no. 'xconfig' would seem to let you think they have been
> changed to 'y', but they have not. I have been able to generate a bad
> configuration (TPM module, EVM built-in) using only {menu,x}config.
>
> btw, I never edit the configuration manually, there is a big fat "DO
> NOT EDIT" header in the beginning.
>
> Depending on what you expect, one way to fix that is to make EVM
> depends on TCG_TPM = y, not just TCG_TPM.
>
> - Arnaud
Thanks, that seems to work for now. I'd really like to remove the
trusted-key and TCG_TPM dependencies from encrypted keys. Thus removing
the TCG_TPM dependency from EVM. But then, trusted keys could be
enabled differently than encrypted keys.
Is there a way of allowing 'A' not to be dependent on 'B', but if 'B' is
defined, force 'B' to be built-in if 'A' is built-in, or as a module if
'A' is a module?
thanks,
Mimi
^ permalink raw reply
* Re: linux next: Native Linux KVM tool inclusion request
From: Stephen Rothwell @ 2011-08-24 1:52 UTC (permalink / raw)
To: Sasha Levin
Cc: linux-kernel, Avi Kivity, Ingo Molnar, Andrew Morton,
Linus Torvalds, Pekka Enberg, linux-next, Christoph Hellwig
In-Reply-To: <1314044960.3668.9.camel@lappy>
[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]
Hi Sasha,
On Mon, 22 Aug 2011 23:29:20 +0300 Sasha Levin <levinsasha928@gmail.com> wrote:
>
> I would like to ask you to include the Native Linux KVM tool in the
> linux-next tree.
>
> The branch is named 'master' and is located in:
>
> git://github.com/penberg/linux-kvm.git
I have included your tree from today and called it "kvmtool". I have you
and Pekka currently listed as teh contacts (since it looks like it is his
tree on github). Please consider adding a MAINTAINERS entry for this.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the unicore32 tree
From: Guan Xuetao @ 2011-08-24 1:28 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Stephen Rothwell, David Miller, netdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Zhang Shu, Chu Xiaowei, Su Yonggang
In-Reply-To: <1314090049.2128.224.camel@jtkirshe-mobl>
On Tue, 2011-08-23 at 02:00 -0700, Jeff Kirsher wrote:
> On Mon, 2011-08-22 at 20:02 -0700, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net tree got conflicts in
> > drivers/net/Kconfig and drivers/net/Makefile between commit
> > e8787de6fa83
> > ("unicore32: add pkunity-v3 mac/net driver (umal)") from the unicore32
> > tree and the network driver rearrangement from the net tree.
> >
> > I just added the new driver from the unicore32 tree commit into each
> > file
> > (see below).
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
>
> Hmm, well with the latest series of patches I sent out, I am pretty sure
> this patch would not apply.
Ok, I see.
Thanks Jeff, and thanks Stephen.
Guan Xuetao
>
> Is it best that this patch not be sent to netdev for driver
> inclusion? :)
^ permalink raw reply
* Re: linux-next: manual merge of the pm tree with the mfd tree
From: Stephen Rothwell @ 2011-08-24 1:12 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, linux-kernel, Felipe Balbi, Samuel Ortiz, Mark Brown
In-Reply-To: <201108240016.33529.rjw@sisk.pl>
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
Hi Rafael,
On Wed, 24 Aug 2011 00:16:33 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> On Tuesday, August 23, 2011, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the pm tree got a conflict in
> > drivers/mfd/twl4030-irq.c between commit 99efe0d4c992 ("mfd: Drop the
> > twl4030-irq kthread") from the mfd tree and commit febab68efa45
> > ("freezer: don't unnecessarily set PF_NOFREEZE explicitly") from the pm
> > tree.
> >
> > The former dropped the code modified by the latter, so I did that.
>
> Thanks!
>
> Unfortunately, I don't think we can really fix that other that making
> one tree depend on the other.
We can just leave it for Linus to fix up during the next merge window.
After all, I figured it out. :-)
("git rerere" takes care of fixing it up for me from now on)
--
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 failure after merge of the final tree (wireless & staging trees related)
From: Stephen Rothwell @ 2011-08-24 1:06 UTC (permalink / raw)
To: Greg KH
Cc: Kalle Valo, John W. Linville, Greg KH, linux-next, linux-kernel,
Vasanthakumar Thiagarajan, Raja Mani, linux-wireless
In-Reply-To: <20110823213013.GC3679@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
Hi Greg,
On Tue, 23 Aug 2011 14:30:13 -0700 Greg KH <greg@kroah.com> wrote:
>
> Note, I also applied this to the staging-next tree to keep people from
> sending me cleanup patches against the driver. git will resolve the
> fact that it was deleted in both branches just fine when we merge with
> Linus for 3.2.
Clearly, I should read ahead in my email before replying :-)
--
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: Tree for Aug 22 (evm)
From: Randy Dunlap @ 2011-08-23 23:40 UTC (permalink / raw)
To: Mimi Zohar
Cc: Arnaud Lacombe, Stephen Rothwell, Mimi Zohar, linux-next, LKML,
linux-kbuild
In-Reply-To: <1314065358.3225.44.camel@localhost.localdomain>
On Mon, 22 Aug 2011 22:09:18 -0400 Mimi Zohar wrote:
> On Mon, 2011-08-22 at 17:49 -0700, Randy Dunlap wrote:
> > On Mon, 22 Aug 2011 20:47:00 -0400 Arnaud Lacombe wrote:
> >
> > > Hi,
> > >
> > > On Mon, Aug 22, 2011 at 3:53 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> > > > On Mon, 22 Aug 2011 14:53:04 +1000 Stephen Rothwell wrote:
> > > >
> > > >> Hi all,
> > > >>
> > > >> [The kernel.org mirroring is a bit low today]
> > > >
> > > > (on x86_64:)
> > > >
> > > > When CONFIG_EVM=y, CONFIG_CRYPTO_HASH2=m, CONFIG_TRUSTED_KEYS=m,
> > > > CONFIG_ENCRYPTED_KEYS=m, the build fails with:
> > > >
> > > You did not provide the value of CONFIG_TCG_TPM, I'll assume it was
> > > 'm'. That said, correct me if I'm wrong, but we currently have:
> >
> > Yes, it was 'm'.
> >
> > > menuconfig TCG_TPM
> > > tristate "TPM Hardware Support"
> > >
> > > [...]
> > >
> > > config EVM
> > > boolean "EVM support"
> > > depends on SECURITY && KEYS && TCG_TPM
> > >
> > > which seems terribly broken to me... How can you have a built-in
> > > feature, which depends on another potentially-not-built-in feature ?
> >
> > Yup.
>
> Easy, different use cases. The TPM has been around and used for a while,
> not requiring it to be built-in. EVM, a new use case, requires it to be
> built-in.
>
> > > If you change EVM to 'tristate', you will see that you are not allowed
> > > to make it built-in if TCG_TPM is not built-in.
> >
> > Right.
>
> The TPM, crypto, trusted and encrypted keys are tristate. Like the
> LSMs, EVM is boolean, which when selected using 'make xconfig', converts
> the tristates to built-in. The tristate/boolean mismatches aren't
> corrected, when .config is edited directly.
> Mimi:
This isn't a problem about editing .config directly. I haven't done that
here. Also, if 'make xconfig' would convert tristates to built-in, then
so would 'make oldconfig', which is done automatically if configs have
changed (or maybe it's 'make silentoldconfig').
I think that you are going to need to do something like Arnaud suggested
and use "depends on TCG_TPM=y" instead of just "depends on TCG_TPM",
unless you can convince someone that this is a kconfig bug.
> > > - Arnaud
> > >
> > > > (.text+0x378aa): undefined reference to `key_type_encrypted'
> > > > evm_crypto.c:(.text+0x37992): undefined reference to `crypto_alloc_shash'
> > > > evm_crypto.c:(.text+0x37a24): undefined reference to `crypto_shash_setkey'
> > > > evm_crypto.c:(.text+0x37ad9): undefined reference to `crypto_shash_update'
> > > > evm_crypto.c:(.text+0x37aeb): undefined reference to `crypto_shash_final'
> > > > (.text+0x37b4b): undefined reference to `crypto_shash_update'
> > > > (.text+0x37c61): undefined reference to `crypto_shash_update'
> > > > (.text+0x37cb9): undefined reference to `crypto_shash_update'
> > > >
> > > > even though EVM (Kconfig) selects ENCRYPTED_KEYS and TRUSTED_KEYS..
> > > > and even after I add "select CRYPTO_HASH2".
> > > >
> > > > Is this because EVM is bool and kconfig is confused about 'select's
> > > > when a bool is selecting tristates? Shouldn't the tristates become
> > > > 'y' instead of 'm' if they are selected by a bool that is 'y'?
> > > >
> > > >
> > > > xconfig shows these symbol values:
> > > >
> > > > Symbol: EVM [=y]
> > > > Type : boolean
> > > > Prompt: EVM support
> > > > Defined at security/integrity/evm/Kconfig:1
> > > > Depends on: SECURITY [=y] && KEYS [=y] && TCG_TPM [=m]
> > > > Location:
> > > > -> Security options
> > > > Selects: CRYPTO_HMAC [=m] && CRYPTO_MD5 [=m] && CRYPTO_SHA1 [=m] && CRYPTO_HASH2 [=m] && ENCRYPTED_KEYS [=m] && TRUSTED_KEYS [=m]
> > > >
> > > >
> > > > Hm, changing TCG_TPM to =y also changes TRUSTED_KEYS and ENCRYPTED_KEYS and
> > > > lots of CRYPTO_ symbols from =m to =y. There must be some kind of min/max
> > > > symbol checking that is confused?
> > > >
> > > there is definitively an underlying min/max, but I would not point
> > > finger too fast.
> >
> >
> > Thanks for your help.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ 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