Another almost-two-weeks, another merge window over and done with.
Yeah, it's actually only just over 12 days since 3.5 was released, but
I hate the people who send me last-minute pull requests, so I like
pulling the rug out from under people who plan on doing their pull
request in day 13 of the 14-day merge window. If that was your plan,
screw that.
But perhaps more importantly, this time I also have some vacation
travel coming up, and I had the choice between keeping the merge
window open for the full 14 days and pushing out -rc1 from the airport
(free wifi at pdx!), or just closing it early and have a day and a
half to perhaps fix up details before leaving. I obviously chose the
latter.
I tried to notify people who had been good and had lots of stuff
pending in linux-next in a timely manner, so this doesn't come as a
surprise to some of you. And I don't think we really missed any big
merges - this -rc1 is slightly smaller than the previous couple of
merge windows if you look at number of commits, but so was linux-next.
I think it is the summer effect, although we're talking about less
than a 10% difference.
I do have two more pull requests that are at least tentatively
pending: there's the uapi header file disintegration from David
Howells and the tcm_vhost merge from Nicholas Bellinger, both of which
came in in time. So I'll take another look at those later. The pain of
another header file revolution doesn't excite me, but we'll see.
Anyway, on to the stuff merged. As usual, even the shortlog is too big
to usefully post, but there's the usual breakdown: about two thirds of
the changes are drivers (with the CSR driver from the staging tree
being a big chunk of the noise - christ, that thing is big and wordy
even after some of the crapectomy).
Of the non-driver portion, a bit over a third is arch (arm, x86, tile,
mips, powerpc, m68k), and the rest is a fairly even split among fs,
include file noise, networking, and just "rest".
I'm appending my "merge shortlog", and I'd like to point out that the
person listed is the person I get the pull request from, which is
*not* about authorship, but just about who I ended up getting stuff
from. And I notice that my shell script to generate this missed stuff
like my merge of Andrew's patch-bombs, because they look different
from the normal git merges. But maybe this gives people at least
*some* kind of overview of what kinds of things got merged/updated.
Linus
---
Alasdair G Kergon:
device-mapper updates
Alex Williamson:
VFIO core
Al Viro:
VFS changes
Andres Salomon:
OLPC platform updates
Anton Vorontsov:
battery updates
Arnd Bergmann:
arm-soc board specific updates
arm-soc cleanups
arm-soc clk changes
arm-soc defconfig updates
arm-soc device tree description updates
arm-soc pincontrol drivers update
arm-soc power management changes
arm-soc sparse IRQ conversion
arm soc-specific updates
arm-soc spi updates
arm-soc timer updates
non-critical arm-soc bug fixes
samsung arm-soc dma changes
support for three new arm SoC types
Artem Bityutskiy:
UBI changes
UBIFS updates
Avi Kivity:
KVM updates
Benjamin Herrenschmidt:
powerpc updates
Ben Myers:
xfs update
Bjorn Helgaas:
PCI changes
Bob Liu:
blackfin changes
Bryan Wu:
LED subsystem update
Chris Ball:
MMC updates
Chris Mason:
large btrfs update
Chris Metcalf:
arch/tile updates
Cong Wang:
final kmap_atomic cleanups
Dave Airlie:
drm updates
David Miller:
sparc update
networking update
David Teigland:
dlm updates
Dmitry Torokhov:
input layer updates
Florian Tobias Schandinat:
fbdev updates
Grant Likely:
irqdomain changes
Greg Kroah-Hartman:
char/misc patches
driver core changes
staging tree patches
TTY/Serial patches
USB patches
Greg Ungerer:
m68knommu arch update
Guenter Roeck:
hwmon fixes
hwmon updates
Herbert Xu:
crypto updates
Ingo Molnar:
core/iommu changes
debug-for-linus git tree
perf updates
RCU changes
scheduler changes
smp/hotplug changes
timer core changes
x86/asm changes
x86/boot changes
x86 cleanup and cpufeature
x86/mce changes
x86 platform changes
x86/reboot changes
x86/uv changes
James Bottomley:
first round of SCSI updates
James Morris:
security subsystem updates
Jan Kara:
misc udf, ext2, ext3, and isofs fixes
J. Bruce Fields:
nfsd changes
Jean Delvare:
a howmon update
i2c updates
Jeff Garzik:
libata updates
Jens Axboe:
block driver changes
core block IO bits
Jiri Kosina:
HID updates
trivial tree
Joerg Roedel:
IOMMU updates
Konrad Rzeszutek Wilk:
frontswap updates
Xen update
Len Brown:
ACPI & power management update
Linus Walleij:
GPIO changes
pin control changes
Marek Szyprowski:
DMA-mapping updates
Mark Brown:
regmap updates
regulator updates
spi updates
Mark Salter:
C6X changes
Martin Schwidefsky:
s390 updates
Matthew Garrett:
x86 platform driver updates
Mauro Carvalho Chehab:
EDAC patches
media updates
second set of media updates
Michael Turquette:
common clk framework changes
Michal Marek:
kbuild fix
kconfig changes
misc kbuild changes
treewide kbuild cleanup
NeilBrown:
additional md update
md updates
Nicholas Bellinger:
target updates
Ohad Ben-Cohen:
remoteproc update
Olof Johansson:
arm-soc board updates
arm-soc cpuidle enablement for OMAP
ARM SoC fixes
arm-soc Marvell Orion device-tree updates
Paul Mundt:
SuperH updates
Pekka Enberg:
SLAB changes
Peter Anvin:
x86/mm changes
Rafael Wysocki:
power management updates
Ralf Baechle:
MIPS updates
Richard Weinberger:
UML fixes
Rob Herring:
devicetree updates
Roland Dreier:
final RDMA changes
InfiniBand/RDMA changes
Russell King:
ARM audit/signal updates
ARM DMA engine updates
ARM updates
Rusty Russell:
cpumask changes
virtio update
Sage Weil:
Ceph changes
Samuel Ortiz:
MFD bits
Stefan Richter:
firewire updates
Steve French:
CIFS update
Steven Rostedt:
ktest changes
localmodconfig updates
Steven Whitehouse:
GFS2 updates
Takashi Iwai:
sound update
Ted Ts'o:
ext4 updates
random subsystem patches
Tejun Heo:
cgroup changes
workqueue changes
Thierry Reding:
PWM subsystem
Tony Luck:
misc Itanium fixes
Trond Myklebust:
NFS client updates
Tyler Hicks:
ecryptfs fixes
Vinod Koul:
slave-dmaengine update
Wim Van Sebroeck:
watchdog changes
Wolfram Sang:
embedded i2c changes
Wu Fengguang:
writeback updates
Hi Linus,
On Thu, 2012-08-02 at 18:17 -0700, Linus Torvalds wrote:
> Yeah, it's actually only just over 12 days since 3.5 was released, but
> I hate the people who send me last-minute pull requests, so I like
> pulling the rug out from under people who plan on doing their pull
> request in day 13 of the 14-day merge window. If that was your plan,
> screw that.
We have had 11 of 13 pieces of the 'sync_supers()' removal patch-sets
merged. The 12th piece removes dead code in exofs was supposed to go
through the exofs tree and blocked the 13th piece which removes
'sync_supers()' and was supposed to go via the VFS tree.
Both 12th and 13th pieces zap dead code. I man not sure delaying that to
v3.7 would be very beneficial for the kernel (why having a useless
thread waking up every 5 secs?). Would you let us merge this to -rc1?
--
Best Regards,
Artem Bityutskiy
Good afternoon Linus!
On Thu, 2012-08-02 at 18:17 -0700, Linus Torvalds wrote:
> I do have two more pull requests that are at least tentatively
> pending: there's the uapi header file disintegration from David
> Howells and the tcm_vhost merge from Nicholas Bellinger, both of which
> came in in time. So I'll take another look at those later.
Thanks for considering to let tcm_vhost fall under the new driver merge
exception rule for post -rc1 code.
Everything is still ready to go on our side for an initial merge, and I
just doubled checked that target-pending/for-linus is still merging
cleanly w/ the same diffstat into a local HEAD at refs/tags/v3.6-rc1.
As usual, please let us know if you have any concerns.
Thank you,
--nab
On Thu, Aug 2, 2012 at 11:47 PM, Artem Bityutskiy <[email protected]> wrote:
>
> We have had 11 of 13 pieces of the 'sync_supers()' removal patch-sets
> merged. The 12th piece removes dead code in exofs was supposed to go
> through the exofs tree and blocked the 13th piece which removes
> 'sync_supers()' and was supposed to go via the VFS tree.
>
> Both 12th and 13th pieces zap dead code. I man not sure delaying that to
> v3.7 would be very beneficial for the kernel (why having a useless
> thread waking up every 5 secs?). Would you let us merge this to -rc1?
Ok. I'm pulling the exofs changes, they're small and remove more lines
than they add. And if the last piece then just kills dead code, I
won't mind that either.
Linus
From: Randy Dunlap <[email protected]>
Fix printk format warning (on i386) in pstore:
fs/pstore/ram.c:409:3: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'size_t'
Signed-off-by: Randy Dunlap <[email protected]>
Acked-by: Kees Cook <[email protected]>
Cc: Anton Vorontsov <[email protected]>
---
I posted this patch on June 15 and July 23 but it has not been
merged anywhere afaict, so I'm sending it directly to the man.
fs/pstore/ram.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- lnx-36-rc1.orig/fs/pstore/ram.c
+++ lnx-36-rc1/fs/pstore/ram.c
@@ -406,7 +406,7 @@ static int __devinit ramoops_probe(struc
goto fail_init_fprz;
if (!cxt->przs && !cxt->cprz && !cxt->fprz) {
- pr_err("memory size too small, minimum is %lu\n",
+ pr_err("memory size too small, minimum is %zu\n",
cxt->console_size + cxt->record_size +
cxt->ftrace_size);
goto fail_cnt;
On Fri, Aug 03, 2012 at 05:02:48PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix printk format warning (on i386) in pstore:
>
> fs/pstore/ram.c:409:3: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'size_t'
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Acked-by: Kees Cook <[email protected]>
> Cc: Anton Vorontsov <[email protected]>
> ---
> I posted this patch on June 15 and July 23 but it has not been
> merged anywhere afaict, so I'm sending it directly to the man.
(I believe it's the first time I see that patch.)
Btw, I see no maintainers for the pstore, and it surely no longer
belongs to staging. Tony, I can send patches to you, or I can create
a git tree (actually, I already had it for my own convenience).. So
how about the following patch?
Kees, Colin, as you're also pstore authors, I assume you're interested
in reviewing/[n]acking any possible changes, so I also added you to
the M: entries, is that OK?
- - - -
From: Anton Vorontsov <[email protected]>
Subject: [PATCH] MAINTAINERS: Add pstore maintainers
Signed-off-by: Anton Vorontsov <[email protected]>
---
MAINTAINERS | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 94b823f..9aa40c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5496,6 +5496,18 @@ L: [email protected]
S: Maintained
F: drivers/block/ps3vram.c
+PSTORE FILESYSTEM
+M: Anton Vorontsov <[email protected]>
+M: Colin Cross <[email protected]>
+M: Kees Cook <[email protected]>
+M: Tony Luck <[email protected]>
+S: Maintained
+T: git git://git.infradead.org/users/cbou/linux-pstore.git
+F: fs/pstore/
+F: include/linux/pstore*
+F: drivers/firmware/efivars.c
+F: drivers/acpi/apei/erst.c
+
PTP HARDWARE CLOCK SUPPORT
M: Richard Cochran <[email protected]>
S: Maintained
--
1.7.10.4
On 08/03/2012 06:15 PM, Anton Vorontsov wrote:
> On Fri, Aug 03, 2012 at 05:02:48PM -0700, Randy Dunlap wrote:
>> From: Randy Dunlap <[email protected]>
>>
>> Fix printk format warning (on i386) in pstore:
>>
>> fs/pstore/ram.c:409:3: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'size_t'
>>
>> Signed-off-by: Randy Dunlap <[email protected]>
>> Acked-by: Kees Cook <[email protected]>
>> Cc: Anton Vorontsov <[email protected]>
>> ---
>> I posted this patch on June 15 and July 23 but it has not been
>> merged anywhere afaict, so I'm sending it directly to the man.
>
> (I believe it's the first time I see that patch.)
That's quite possible. When Kees acked it, he advised
me to send it to GregKH, which I did, to no avail.
> Btw, I see no maintainers for the pstore, and it surely no longer
> belongs to staging. Tony, I can send patches to you, or I can create
> a git tree (actually, I already had it for my own convenience).. So
> how about the following patch?
Thanks for adding a MAINTAINERS entry for it.
> Kees, Colin, as you're also pstore authors, I assume you're interested
> in reviewing/[n]acking any possible changes, so I also added you to
> the M: entries, is that OK?
>
> - - - -
> From: Anton Vorontsov <[email protected]>
> Subject: [PATCH] MAINTAINERS: Add pstore maintainers
>
>
> Signed-off-by: Anton Vorontsov <[email protected]>
> ---
> MAINTAINERS | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 94b823f..9aa40c1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5496,6 +5496,18 @@ L: [email protected]
> S: Maintained
> F: drivers/block/ps3vram.c
>
> +PSTORE FILESYSTEM
> +M: Anton Vorontsov <[email protected]>
> +M: Colin Cross <[email protected]>
> +M: Kees Cook <[email protected]>
> +M: Tony Luck <[email protected]>
> +S: Maintained
> +T: git git://git.infradead.org/users/cbou/linux-pstore.git
> +F: fs/pstore/
> +F: include/linux/pstore*
> +F: drivers/firmware/efivars.c
> +F: drivers/acpi/apei/erst.c
> +
> PTP HARDWARE CLOCK SUPPORT
> M: Richard Cochran <[email protected]>
> S: Maintained
--
~Randy
On Fri, Aug 3, 2012 at 6:32 PM, Randy Dunlap <[email protected]> wrote:
> On 08/03/2012 06:15 PM, Anton Vorontsov wrote:
>
>> On Fri, Aug 03, 2012 at 05:02:48PM -0700, Randy Dunlap wrote:
>>> From: Randy Dunlap <[email protected]>
>>>
>>> Fix printk format warning (on i386) in pstore:
>>>
>>> fs/pstore/ram.c:409:3: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'size_t'
>>>
>>> Signed-off-by: Randy Dunlap <[email protected]>
>>> Acked-by: Kees Cook <[email protected]>
>>> Cc: Anton Vorontsov <[email protected]>
>>> ---
>>> I posted this patch on June 15 and July 23 but it has not been
>>> merged anywhere afaict, so I'm sending it directly to the man.
>>
>> (I believe it's the first time I see that patch.)
>
> That's quite possible. When Kees acked it, he advised
> me to send it to GregKH, which I did, to no avail.
>
>
>> Btw, I see no maintainers for the pstore, and it surely no longer
>> belongs to staging. Tony, I can send patches to you, or I can create
>> a git tree (actually, I already had it for my own convenience).. So
>> how about the following patch?
>
> Thanks for adding a MAINTAINERS entry for it.
>
>> Kees, Colin, as you're also pstore authors, I assume you're interested
>> in reviewing/[n]acking any possible changes, so I also added you to
>> the M: entries, is that OK?
Cool with me; thanks!
-Kees
--
Kees Cook
Chrome OS Security
On Fri, Aug 03, 2012 at 01:23:29PM -0700, Linus Torvalds wrote:
> On Thu, Aug 2, 2012 at 11:47 PM, Artem Bityutskiy <[email protected]> wrote:
> >
> > We have had 11 of 13 pieces of the 'sync_supers()' removal patch-sets
> > merged. The 12th piece removes dead code in exofs was supposed to go
> > through the exofs tree and blocked the 13th piece which removes
> > 'sync_supers()' and was supposed to go via the VFS tree.
> >
> > Both 12th and 13th pieces zap dead code. I man not sure delaying that to
> > v3.7 would be very beneficial for the kernel (why having a useless
> > thread waking up every 5 secs?). Would you let us merge this to -rc1?
>
> Ok. I'm pulling the exofs changes, they're small and remove more lines
> than they add. And if the last piece then just kills dead code, I
> won't mind that either.
OK... I've ported Artem's patchset on top of exofs merge; Artem, could
you check if you are OK with the result currently in vfs.git#for-linus?
On Sat, 2012-08-04 at 05:46 +0100, Al Viro wrote:
> OK... I've ported Artem's patchset on top of exofs merge; Artem, could
> you check if you are OK with the result currently in vfs.git#for-linus?
Thanks Al, yes, it looks all right.
--
Best Regards,
Artem Bityutskiy
On Fri, 2012-08-03 at 13:23 -0700, Linus Torvalds wrote:
> On Thu, Aug 2, 2012 at 11:47 PM, Artem Bityutskiy <[email protected]> wrote:
> >
> > We have had 11 of 13 pieces of the 'sync_supers()' removal patch-sets
> > merged. The 12th piece removes dead code in exofs was supposed to go
> > through the exofs tree and blocked the 13th piece which removes
> > 'sync_supers()' and was supposed to go via the VFS tree.
> >
> > Both 12th and 13th pieces zap dead code. I man not sure delaying that to
> > v3.7 would be very beneficial for the kernel (why having a useless
> > thread waking up every 5 secs?). Would you let us merge this to -rc1?
>
> Ok. I'm pulling the exofs changes, they're small and remove more lines
> than they add. And if the last piece then just kills dead code, I
> won't mind that either.
Thanks Linus. Yes, the first patch of the series removes dead code, and
there are additional patches which amend comments and documentation
without touching any functionality, just remove words pdflush, s_dirt,
and write_super.
--
Best Regards,
Artem Bityutskiy
On Sat, Aug 04, 2012 at 08:38:35AM +0300, Artem Bityutskiy wrote:
> On Sat, 2012-08-04 at 05:46 +0100, Al Viro wrote:
> > OK... I've ported Artem's patchset on top of exofs merge; Artem, could
> > you check if you are OK with the result currently in vfs.git#for-linus?
>
> Thanks Al, yes, it looks all right.
OK, then... Artem's patchset + do_dentry_open() fix is in the usual place -
git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus
Please, pull...
Shortlog:
Al Viro (1):
missed mnt_drop_write() in do_dentry_open()
Artem Bityutskiy (15):
vfs: kill write_super and sync_supers
Documentation: get rid of write_super
Documentation: fix the VM knobs descritpion WRT pdflush
ext3: nuke write_super from comments
ext4: nuke write_super from comments
ext4: nuke pdflush from comments
btrfs: nuke write_super from comments
btrfs: nuke pdflush from comments
jbd/jbd2: nuke write_super from comments
vfs: nuke pdflush from comments
hfs: nuke write_super from comments
nilfs2: nuke write_super from comments
drbd: nuke pdflush from comments
gfs2: nuke pdflush from comments
UBIFS: nuke pdflush from comments
Diffstat:
Documentation/DocBook/filesystems.tmpl | 4 +-
Documentation/filesystems/Locking | 2 -
Documentation/filesystems/porting | 5 +--
Documentation/filesystems/vfs.txt | 4 --
Documentation/laptops/laptop-mode.txt | 12 ++++----
Documentation/sysctl/vm.txt | 14 ++++----
Documentation/sysctl/vm.txt.rej | 21 +++++++++++++
drivers/block/drbd/drbd_main.c | 4 +-
fs/bio.c | 2 +-
fs/btrfs/inode.c | 3 +-
fs/btrfs/ordered-data.c | 2 +-
fs/btrfs/super.c | 4 --
fs/btrfs/volumes.c | 4 --
fs/ext3/inode.c | 8 -----
fs/ext3/super.c | 11 -------
fs/ext4/inode.c | 10 +-----
fs/ext4/super.c | 11 -------
fs/gfs2/meta_io.c | 2 +-
fs/hfs/mdb.c | 4 +-
fs/jbd/journal.c | 4 +-
fs/jbd2/journal.c | 4 +-
fs/nilfs2/super.c | 4 --
fs/nilfs2/the_nilfs.h | 2 -
fs/open.c | 2 +-
fs/super.c | 40 ------------------------
fs/ubifs/file.c | 10 +++---
fs/ubifs/super.c | 2 +-
include/linux/backing-dev.h | 1 -
include/linux/fs.h | 3 --
include/linux/writeback.h | 1 -
mm/backing-dev.c | 52 --------------------------------
mm/page-writeback.c | 1 -
32 files changed, 59 insertions(+), 194 deletions(-)
create mode 100644 Documentation/sysctl/vm.txt.rej
On Sat, Aug 4, 2012 at 2:19 PM, Al Viro <[email protected]> wrote:
>
> Documentation/sysctl/vm.txt.rej | 21 +++++++++++++
vm.txt.rej ???
On Sat, Aug 04, 2012 at 03:51:01PM +0800, Dongsheng Song wrote:
> On Sat, Aug 4, 2012 at 2:19 PM, Al Viro <[email protected]> wrote:
> >
> > Documentation/sysctl/vm.txt.rej | 21 +++++++++++++
>
> vm.txt.rej ???
Grrr... git add Documentation/sysctl/ during conflict-resolving in git am, having
forgotten that this turd wasn't removed in process, then a bit of blindness when
generating and pasting the diffstat ;-/ Thanks for spotting.
I've put the branch sans that idiocy in the same tree; for-linus-2 (basically,
branched off at the commit introducing that, then git rm Documentation/sysctl/*.rej
to get rid of that sucker, git commit --amend, git cherry-pick <branchpoint>..for-linus)
Same shortlog, same diffstat sans that idiocy... Alternatively, it could be fixed
up upon merge, if Linus is really dead set against any rebases (same git rm/git commit --amend
right after git merge or git pull, whatever Linus uses).
Sorry about that ;-/
> Btw, I see no maintainers for the pstore, and it surely no longer
> belongs to staging. Tony, I can send patches to you, or I can create
> a git tree (actually, I already had it for my own convenience).. So
> how about the following patch?
Acked-by: Tony Luck <[email protected]>
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?