Kernel

linux-next: manual merge of the ext3 tree with Linus' tree
Hi Jan, Today's linux-next merge of the ext3 tree got a conflict in fs/super.c between commits b20bd1a5e78af267dc4b6e1ffed48d5d776302c5 ("get rid of S_BIAS"), 1712ac8fda7d8bc4dc921f5777b7423aacad7263 ("Saner locking around deactivate_super()") and e1e46bf1866317d4f86f66bf18d3f07317d9f9ee ("Trim includes in fs/su... 27 May 2010 12:37

linux-next: manual merge of the ext4 tree with the ext3 tree
Hi Ted, Today's linux-next merge of the ext4 tree got a conflict in fs/ext4/super.c between commits c3d0adcbfef01b69c455ae21aea1ca78ede127db ("quota: move remount handling into the filesystem") and 96bfb05b3177d4d381c136a2c3f44b63cec97f7b ("quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers") from t... 22 May 2010 03:01

linux-next: manual merge of the ext4 tree with Linus' tree
Hi Ted, Today's linux-next merge of the ext4 tree got a conflict in include/linux/quotaops.h between commit 12755627bdcddcdb30a1bfb9a09395a52b1d6838 ("quota: unify quota init condition in setattr") from Linus' tree and commits 2b03a9dee57f0a567b17571774d6a6ee8e0135b6 ("quota: use flags interface for dquot alloc... 22 May 2010 03:01

linux-next: build warning after merge of the squashfs tree
Hi Phillip, After merging the squashfs tree, today's linux-next build (x86_64 allmodconfig) produced this warning: fs/squashfs/super.c: In function 'squashfs_fill_super': fs/squashfs/super.c:265: warning: assignment from incompatible pointer type Introduced by commit 67f66cc6c728de183d9d43c243cb163c1ebd8e04 ... 22 May 2010 23:37

[PATCH] linux/elfcore.h: hide kernel functions
The declarations for elf_core_extra_phdrs() et al got added on the wrong side of #ifdef __KERNEL__ in linux/elfcore.h so they leak into the user header copy and we get a warning at build time about it. Signed-off-by: Roland McGrath <roland(a)redhat.com> --- include/linux/elfcore.h | 4 ++-- 1 files changed, 2... 21 May 2010 23:48

PM: Opportunistic suspend support.
On Fri, 21 May 2010, [UTF-8] Arve Hjønnevåg wrote: The first goal can be achieved either by using device runtime PM and cpuidle to put all hardware into low-power states, transparently from the user space point of view, or by suspending the whole system. However, system suspend, in its current form, does ... 27 May 2010 20:22

direct-io: do not merge logically non-contiguous requests
On Fri, May 21, 2010 at 10:03 AM, Josef Bacik <josef(a)redhat.com> wrote: Btrfs cannot handle having logically non-contiguous requests submitted.  For example if you have Logical:  [0-4095][HOLE][8192-12287] Physical: [0-4095]      [4096-8191] Normally the DIO code would put these into the same BIO's... 21 May 2010 22:43

[PATCH -mm] Documentation/DMA-API-HOWTO: add ARCH_KMALLOC_MINALIGN description
Adds ARCH_KMALLOC_MINALIGN description in "Platform Issues" section. Signed-off-by: FUJITA Tomonori <fujita.tomonori(a)lab.ntt.co.jp> --- Documentation/DMA-API-HOWTO.txt | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API... 21 May 2010 21:38

PCI changes
On Fri, 21 May 2010, Jesse Barnes wrote: are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ..BRANCH.NOT.VERIFIED.. Sorry about the "not verified" bit, I just rebased the top 3 patches & pushed an update to drop one Bjorn was a little nerv... 22 May 2010 05:09

pcm551.c: use pci_ids.h defines
On Fri, May 21, 2010 at 06:24:01PM -0500, H Hartley Sweeten wrote: Move the DEVICE id to pci_ids.h and then use the VENDOR/DEVICE ids provided in pci_ids.h instead of creating local ids. Did you read the comment at the top of the pci_ids.h file saying not to do this? Just use the vendor id that is already in... 21 May 2010 20:32