This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, master has been updated
993ecff Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
9879326 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
eb59c50 Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
29ad0de Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
34c80b1 vfs: switch ->show_options() to struct dentry *
576b1d6 xfs: propagate umode_t
1a67aaf switch ->mknod() to umode_t
4acdaf2 switch ->create() to umode_t
18bb1db switch vfs_mkdir() and ->mkdir() to umode_t
6b520e0 vfs: fix the stupidity with i_dentry in inode destructors
2a79f17 vfs: mnt_drop_write_file()
a561be7 switch a bunch of places to mnt_want_write_file()
be4f1ac xfs: log all dirty inodes in xfs_fs_sync_fs
0b8fd30 xfs: log the inode in ->write_inode calls for kupdate
b00f4dc Merge branch 'master' into pm-sleep
90802ed treewide: Fix comment and string typo 'bufer'
42b2aa8 treewide: Fix typos in various parts of the kernel, and fix some comments.
a0acae0 freezer: unexport refrigerator() and update try_to_freeze() slightly
from b1c770c273a4787069306fc82aab245e9ac72e9d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 993ecff81aa6d50d694704de2647a5529ff2f166
Merge: 12e55508921865aefdd80fd17afe70c191afbd1b b1c770c273a4787069306fc82aab245e9ac72e9d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Jan 9 12:50:15 2012 -0800
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: fix endian conversion issue in discard code
commit 98793265b429a3f0b3f1750e74d67cd4d740d162
Merge: b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 bd1b2a555952d959f47169056fca05acf7eff81f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Jan 8 13:21:22 2012 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
commit eb59c505f8a5906ad2e053d14fab50eb8574fd6f
Merge: 1619ed8f60959829d070d8f39cd2f8ca0e7135ce c233523b3d392e530033a7587d7970dc62a02361
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Jan 8 13:10:57 2012 -0800
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)
PM / Hibernate: Implement compat_ioctl for /dev/snapshot
PM / Freezer: fix return value of freezable_schedule_timeout_killable()
PM / shmobile: Allow the A4R domain to be turned off at run time
PM / input / touchscreen: Make st1232 use device PM QoS constraints
PM / QoS: Introduce dev_pm_qos_add_ancestor_request()
PM / shmobile: Remove the stay_on flag from SH7372's PM domains
PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume
PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode
PM: Drop generic_subsys_pm_ops
PM / Sleep: Remove forward-only callbacks from AMBA bus type
PM / Sleep: Remove forward-only callbacks from platform bus type
PM: Run the driver callback directly if the subsystem one is not there
PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers
PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.
PM / Sleep: Merge internal functions in generic_ops.c
PM / Sleep: Simplify generic system suspend callbacks
PM / Hibernate: Remove deprecated hibernation snapshot ioctls
PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()
ARM: S3C64XX: Implement basic power domain support
PM / shmobile: Use common always on power domain governor
...
Fix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused
XBT_FORCE_SLEEP bit
commit 29ad0de279002f9b6a63df5ba85328f5b633b842
Merge: 972b2c719990f91eb3b2310d44ef8a2d38955a14 40d344ec5ee440596b1f3ae87556e20c7197757a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Jan 8 13:05:29 2012 -0800
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (22 commits)
xfs: mark the xfssyncd workqueue as non-reentrant
xfs: simplify xfs_qm_detach_gdquots
xfs: fix acl count validation in xfs_acl_from_disk()
xfs: remove unused XBT_FORCE_SLEEP bit
xfs: remove XFS_QMOPT_DQSUSER
xfs: kill xfs_qm_idtodq
xfs: merge xfs_qm_dqinit_core into the only caller
xfs: add a xfs_dqhold helper
xfs: simplify xfs_qm_dqattach_grouphint
xfs: nest qm_dqfrlist_lock inside the dquot qlock
xfs: flatten the dquot lock ordering
xfs: implement lazy removal for the dquot freelist
xfs: remove XFS_DQ_INACTIVE
xfs: cleanup xfs_qm_dqlookup
xfs: cleanup dquot locking helpers
xfs: remove the sync_mode argument to xfs_qm_dqflush_all
xfs: remove xfs_qm_sync
xfs: make sure to really flush all dquots in xfs_qm_quotacheck
xfs: untangle SYNC_WAIT and SYNC_TRYLOCK meanings for xfs_qm_dqflush
xfs: remove the lid_size field in struct log_item_desc
...
Fix up trivial conflict in fs/xfs/xfs_sync.c
commit 34c80b1d93e6e20ca9dea0baf583a5b5510d92d4
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 8 21:32:45 2011 -0500
vfs: switch ->show_options() to struct dentry *
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit 576b1d67ce949e7542ff765b00eb5357e706768b
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Jul 26 02:50:15 2011 -0400
xfs: propagate umode_t
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit 1a67aafb5f72a436ca044293309fa7e6351d6a35
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Jul 26 01:52:52 2011 -0400
switch ->mknod() to umode_t
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit 4acdaf27ebe2034c342f3be57ef49aed1ad885ef
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Jul 26 01:42:34 2011 -0400
switch ->create() to umode_t
vfs_create() ignores everything outside of 16bit subset of its
mode argument; switching it to umode_t is obviously equivalent
and it's the only caller of the method
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit 18bb1db3e7607e4a997d50991a6f9fa5b0f8722c
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Tue Jul 26 01:41:39 2011 -0400
switch vfs_mkdir() and ->mkdir() to umode_t
vfs_mkdir() gets int, but immediately drops everything that might not
fit into umode_t and that's the only caller of ->mkdir()...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit 6b520e0565422966cdf1c3759bd73df77b0f248c
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Mon Dec 12 15:51:45 2011 -0500
vfs: fix the stupidity with i_dentry in inode destructors
Seeing that just about every destructor got that INIT_LIST_HEAD() copied into
it, there is no point whatsoever keeping this INIT_LIST_HEAD in inode_init_once();
the cost of taking it into inode_init_always() will be negligible for pipes
and sockets and negative for everything else. Not to mention the removal of
boilerplate code from ->destroy_inode() instances...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit 2a79f17e4a641a2f463cb512cb0ec349844a147b
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Fri Dec 9 08:06:57 2011 -0500
vfs: mnt_drop_write_file()
new helper (wrapper around mnt_drop_write()) to be used in pair with
mnt_want_write_file().
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit a561be7100cd610bd2e082f3211c1dfb45835817
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Wed Nov 23 11:57:51 2011 -0500
switch a bunch of places to mnt_want_write_file()
it's both faster (in case when file has been opened for write) and cleaner.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
commit b00f4dc5ff022cb9cbaffd376d9454d7fa1e496f
Merge: 1eac8111e0763853266a171ce11214da3a347a0a b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date: Wed Dec 21 21:59:45 2011 +0100
Merge branch 'master' into pm-sleep
* master: (848 commits)
SELinux: Fix RCU deref check warning in sel_netport_insert()
binary_sysctl(): fix memory leak
mm/vmalloc.c: remove static declaration of va from __get_vm_area_node
ipmi_watchdog: restore settings when BMC reset
oom: fix integer overflow of points in oom_badness
memcg: keep root group unchanged if creation fails
nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()
nilfs2: unbreak compat ioctl
cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
evm: prevent racing during tfm allocation
evm: key must be set once during initialization
mmc: vub300: fix type of firmware_rom_wait_states module parameter
Revert "mmc: enable runtime PM by default"
mmc: sdhci: remove "state" argument from sdhci_suspend_host
x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT
IB/qib: Correct sense on freectxts increment and decrement
RDMA/cma: Verify private data length
cgroups: fix a css_set not found bug in cgroup_attach_proc
oprofile: Fix uninitialized memory access when writing to writing to oprofilefs
Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
...
Conflicts:
kernel/cgroup_freezer.c
commit 90802ed9c3dbab2e067bd9fc67a30e66e6774e8f
Author: Paul Bolle <pebolle@xxxxxxxxxx>
Date: Mon Dec 5 13:00:34 2011 +0100
treewide: Fix comment and string typo 'bufer'
Signed-off-by: Paul Bolle <pebolle@xxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit 42b2aa86c6670347a2a07e6d7af0e0ecc8fdbff9
Author: Justin P. Mattock <justinmattock@xxxxxxxxx>
Date: Mon Nov 28 20:31:00 2011 -0800
treewide: Fix typos in various parts of the kernel, and fix some comments.
The below patch fixes some typos in various parts of the kernel, as well as fixes some comments.
Please let me know if I missed anything, and I will try to get it changed and resent.
Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
commit a0acae0e886d44bd5ce6d2f173c1ace0fcf0d9f6
Author: Tejun Heo <tj@xxxxxxxxxx>
Date: Mon Nov 21 12:32:22 2011 -0800
freezer: unexport refrigerator() and update try_to_freeze() slightly
There is no reason to export two functions for entering the
refrigerator. Calling refrigerator() instead of try_to_freeze()
doesn't save anything noticeable or removes any race condition.
* Rename refrigerator() to __refrigerator() and make it return bool
indicating whether it scheduled out for freezing.
* Update try_to_freeze() to return bool and relay the return value of
__refrigerator() if freezing().
* Convert all refrigerator() users to try_to_freeze().
* Update documentation accordingly.
* While at it, add might_sleep() to try_to_freeze().
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Samuel Ortiz <samuel@xxxxxxxxxx>
Cc: Chris Mason <chris.mason@xxxxxxxxxx>
Cc: "Theodore Ts'o" <tytso@xxxxxxx>
Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: KONISHI Ryusuke <konishi.ryusuke@xxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
-----------------------------------------------------------------------
Summary of changes:
fs/xfs/xfs_buf.c | 4 ++--
fs/xfs/xfs_file.c | 6 +++---
fs/xfs/xfs_ialloc.c | 4 ++--
fs/xfs/xfs_ialloc.h | 2 +-
fs/xfs/xfs_iget.c | 1 -
fs/xfs/xfs_inode.c | 4 ++--
fs/xfs/xfs_inode.h | 2 +-
fs/xfs/xfs_ioctl.c | 8 ++++----
fs/xfs/xfs_ioctl32.c | 8 ++++----
fs/xfs/xfs_iops.c | 8 ++++----
fs/xfs/xfs_log_cil.c | 2 +-
fs/xfs/xfs_super.c | 34 +++++++---------------------------
fs/xfs/xfs_sync.c | 36 ++++++++++++++++++++++++++++++++++++
fs/xfs/xfs_sync.h | 2 ++
fs/xfs/xfs_utils.c | 2 +-
fs/xfs/xfs_utils.h | 2 +-
fs/xfs/xfs_vnodeops.c | 4 ++--
fs/xfs/xfs_vnodeops.h | 4 ++--
18 files changed, 75 insertions(+), 58 deletions(-)
hooks/post-receive
--
XFS development tree
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
