David S. Miller
14d3692f04
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
The following patchset contains relevant updates for the Netfilter
tree, they are:
* Enhancements for ipset: Add the counter extension for sets, this
information can be used from the iptables set match, to change
the matching behaviour. Jozsef required to add the extension
infrastructure and moved the existing timeout support upon it.
This also includes a change in net/sched/em_ipset to adapt it to
the new extension structure.
* Enhancements for performance boosting in nfnetlink_queue: Add new
configuration flags that allows user-space to receive big packets (GRO)
and to disable checksumming calculation. This were proposed by Eric
Dumazet during the Netfilter Workshop 2013 in Copenhagen. Florian
Westphal was kind enough to find the time to materialize the proposal.
* A sparse fix from Simon, he noticed it in the SCTP NAT helper, the fix
required a change in the interface of sctp_end_cksum.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-29 14:29:06 -04:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2013-02-26 09:24:48 -08:00
brcmfmac: setup SDIO reset behavior
2013-04-12 14:27:55 -04:00
libceph: add support for HASHPSPOOL pool flag
2013-02-26 15:03:06 -08:00
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
hsi: fix kernel-doc warnings
2013-03-01 13:39:00 -08:00
Input: atmel_mxt_ts - Support for touchpad variant
2013-03-08 16:03:29 -08:00
iio: Fix build error seen if IIO_TRIGGER is defined but IIO_BUFFER is not
2013-03-02 16:31:21 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-02-20 11:00:43 -08:00
ImgTec Meta architecture changes for v3.9-rc1
2013-03-03 12:06:09 -08:00
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
2013-02-28 18:02:55 -08:00
char/misc driver fixes for 3.9-rc4
2013-03-28 15:51:33 -07:00
net/mlx4: Add support to get VF config
2013-04-26 23:29:14 -04:00
mmc: sh_mobile_sdhi: remove unused .pdata field
2013-02-24 14:37:22 -05:00
mtd: nand: reintroduce NAND_NO_READRDY as NAND_NEED_READRDY
2013-03-14 12:48:54 +00:00
netfilter: ipset: set match: add support to match the counters
2013-04-29 20:09:03 +02:00
pinctrl: generic: rename input schmitt disable
2013-02-15 09:52:29 +01:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-04-24 10:54:20 -04:00
bq2415x_charger: Add support for offline and 100mA mode
2013-02-16 13:34:10 -08:00
regulator: core: update kernel documentation for regulator_desc
2013-03-01 06:07:22 +00:00
sched: move RR_TIMESLICE from sysctl.h to rt.h
2013-02-22 09:20:11 -08:00
at86rf230: add irq type configuration option
2013-04-16 16:34:07 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2013-04-23 14:09:39 -04:00
NFS client bugfixes for Linux 3.9
2013-03-02 16:46:07 -08:00
usbnet: handle link change
2013-04-11 15:57:32 -04:00
x86, ACPI, mm: Revert movablemem_map support
2013-03-02 09:34:39 -08:00
libata: Use integer return value for atapi_command_packet_set
2013-04-03 19:33:40 -04:00
bdi: allow block devices to say that they require stable page writes
2013-02-21 17:22:19 -08:00
watchdog: bcm47xx_wdt.c: use platform device
2013-03-01 12:47:16 +01:00
fs/exec.c: make bprm_mm_init() static
2013-02-26 02:46:13 -05:00
Revert "block: add missing block_bio_complete() tracepoint"
2013-04-18 09:00:26 -07:00
Input: bma150 - make some defines public and fix some comments
2013-02-15 18:52:45 -08:00
memory-hotplug: common APIs to support page tables hot-remove
2013-02-23 17:50:12 -08:00
Btrfs: move fs/btrfs/ioctl.h to include/uapi/linux/btrfs.h
2013-02-20 09:37:28 -05:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
Add file_ns_capable() helper function for open-time capability checking
2013-04-14 10:06:31 -07:00
connector: Added coredumping event to the process connector
2013-03-20 13:23:21 -04:00
mm: compaction: make __compact_pgdat() and compact_pgdat() return void
2013-02-23 17:50:10 -08:00
Fix breakage in MIPS siginfo handling
2013-03-19 19:15:52 +01:00
compiler-gcc.h: Add gcc-recommended GCC_VERSION macro
2013-02-21 17:22:15 -08:00
compiler-gcc{3,4}.h: Use GCC_VERSION macro
2013-02-21 17:22:15 -08:00
compiler{,-gcc4}.h, bug.h: Remove duplicate macros
2013-02-21 17:22:15 -08:00
bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG
2013-02-21 17:22:16 -08:00
sched: add wait_for_completion_io[_timeout]
2013-02-15 16:45:06 +01:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-02-25 16:46:44 -08:00
vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
2013-02-26 02:46:09 -05:00
Revert "lockdep: check that no locks held at freeze time"
2013-03-31 11:38:33 -07:00
PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset
2013-04-02 01:28:41 +02:00
dm: add target num_write_bios fn
2013-03-01 22:45:49 +00:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
dm kcopyd: introduce configurable throttling
2013-03-01 22:45:49 +00:00
dma-buf: implement vmap refcounting in the interface logic
2013-02-27 15:13:36 +05:30
dmaengine: add dma_request_slave_channel_compat()
2013-02-27 22:37:34 +05:30
dmaengine: dw_dmac: move to generic DMA binding
2013-02-28 09:53:21 +05:30
eCryptfs: allow userspace messaging to be disabled
2013-03-03 23:59:59 -08:00
EDAC: Merge mci.mem_is_per_rank with mci.csbased
2013-03-16 06:32:30 +01:00
x86, efivars: firmware bug workarounds should be in platform code
2013-04-09 11:34:05 +01:00
Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block
2013-02-28 12:52:24 -08:00
default SET_PERSONALITY() in linux/elf.h
2013-02-26 02:46:08 -05:00
include/linux/eventfd.h: fix incorrect filename is a comment
2013-02-27 19:10:23 -08:00
include/linux: printk is needed in filter.h when CONFIG_BPF_JIT is defined
2013-03-29 23:31:34 -04:00
memory-hotplug: remove /sys/firmware/memmap/X sysfs
2013-02-23 17:50:12 -08:00
Revert "lockdep: check that no locks held at freeze time"
2013-03-31 11:38:33 -07:00
fs: Limit sys_mount to only request filesystem modules.
2013-03-03 19:36:31 -08:00
userns: Don't allow creation if the user is chrooted
2013-03-27 07:49:29 -07:00
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section
2013-04-12 17:12:41 -04:00
block: fix part_pack_uuid() build error
2013-02-26 03:10:52 +11:00
irq: Remove IRQ_EXIT_OFFSET workaround
2013-02-22 00:05:07 +01:00
kprobes: Make hash_64() as always inlined
2013-03-18 10:21:23 +01:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
video: Add generic HDMI infoframe helpers
2013-02-22 08:20:05 +01:00
Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus
2013-02-21 10:45:01 +01:00
mm: remove unused memclear_highpage_flush()
2013-02-23 17:50:16 -08:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
ipv6: Kill ipv6 dependency of icmpv6_send().
2013-04-29 13:54:36 -04:00
idr: deprecate idr_pre_get() and idr_get_new[_above]()
2013-03-13 15:21:47 -07:00
mac80211: parse VHT channel switch IEs
2013-04-16 15:29:45 +02:00
firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.
2013-03-26 12:32:13 -04:00
team: introduce random mode
2013-03-06 14:55:20 -05:00
net: vlan: fix dummy function signatures for CONFIG_VLAN=n
2013-04-21 15:56:59 -04:00
sched/rt: Add <linux/sched/rt.h> header to <linux/init_task.h>
2013-02-19 08:06:01 +01:00
ipmi: remove superfluous kernel/userspace explanation
2013-02-27 19:10:21 -08:00
irq_work.h: fix warning when CONFIG_IRQ_WORK=n
2013-03-22 16:41:19 -07:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
x86, kdump: Retore crashkernel= to allocate under 896M
2013-04-17 12:35:33 -07:00
ksm: remove old stable nodes more thoroughly
2013-02-23 17:50:19 -08:00
net: socket: move ktime2ts to ktime header api
2013-04-19 16:39:13 -04:00
KVM: Allow cross page reads and writes from cached translations.
2013-04-07 13:05:35 +03:00
KVM: Allow cross page reads and writes from cached translations.
2013-04-07 13:05:35 +03:00
libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive
2013-04-03 19:33:43 -04:00
list: Fix double fetch of pointer in hlist_entry_safe()
2013-03-14 13:18:30 -07:00
xen-blkfront: drop the use of llist_for_each_entry_safe
2013-02-19 15:17:08 -05:00
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
lib/lzo: Update LZO compression to current upstream version
2013-02-20 19:36:01 +01:00
x86, ACPI, mm: Revert movablemem_map support
2013-03-02 09:34:39 -08:00
mm: refactor inactive_file_is_low() to use get_lru_size()
2013-02-23 17:50:20 -08:00
memory-hotplug: export the function try_offline_node()
2013-02-23 17:50:13 -08:00
phy/micrel: Add support for KSZ8031
2013-03-12 06:50:58 -04:00
mm: remove offlining arg to migrate_pages
2013-02-23 17:50:19 -08:00
vm: add vm_iomap_memory() helper function
2013-04-16 16:45:45 -07:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs"
2013-03-28 17:45:51 -07:00
mm: zone_end_pfn is too small
2013-03-22 16:41:20 -07:00
vfs: Add a mount flag to lock read only bind mounts
2013-03-27 07:50:04 -07:00
mv643xx_eth: convert to use the Marvell Orion MDIO driver
2013-03-22 10:25:15 -04:00
ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
2013-03-19 11:07:58 +08:00
net: vlan: add 802.1ad support
2013-04-19 14:46:06 -04:00
net: vlan: prepare for 802.1ad VLAN filtering offload
2013-04-19 14:45:27 -04:00
netfilter: remove unneeded variable proc_net_netfilter
2013-04-05 21:08:11 +02:00
netlink: implement memory mapped recvmsg()
2013-04-19 14:57:58 -04:00
NFS client bugfixes for Linux 3.9
2013-03-02 16:46:07 -08:00
of_net.h: Provide empty functions if OF_NET is not configured
2013-04-02 16:43:09 -04:00
openvswitch: Expose <linux/openvswitch.h> to userspace
2013-03-29 17:54:33 -07:00
PM / OPP: fix condition for empty of_init_opp_table()
2013-02-23 00:30:08 +01:00
mm: fold page->_last_nid into page->flags where possible
2013-02-23 17:50:17 -08:00
mm: remove MIGRATE_ISOLATE check in hotpath
2013-02-23 17:50:15 -08:00
mm: only enforce stable page writes if the backing device requires it
2013-02-21 17:22:19 -08:00
constify path_get/path_put and fs_struct.c stuff
2013-03-01 23:51:07 -05:00
pci: Add SRIOV helper function to determine if VFs are assigned to guest
2013-04-24 19:31:58 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2013-02-28 20:42:33 -08:00
perf,x86: fix link failure for non-Intel configs
2013-03-17 15:59:15 -07:00
phy: add set_wol/get_wol functions
2013-03-12 11:40:53 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
pm / runtime: introduce pm_runtime_set_memalloc_noio()
2013-02-23 17:50:16 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
procfs: add proc_remove_subtree()
2013-04-09 14:09:17 -04:00
pwm: Changes for v3.9-rc1
2013-02-26 09:34:29 -08:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
include/linux/res_counter.h needs errno.h
2013-03-13 15:21:44 -07:00
mm/rmap: rename anon_vma_unlock() => anon_vma_unlock_write()
2013-02-23 17:50:17 -08:00
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
net: generic fdb support for drivers without ndo_fdb_<op>
2013-03-07 15:29:45 -05:00
lib/scatterlist: use page iterator in the mapping iterator
2013-02-27 19:10:10 -08:00
kthread: Prevent unpark race which puts threads on the wrong cpu
2013-04-12 14:18:43 +02:00
net: sctp: introduce uapi header for sctp
2013-04-09 13:19:39 -04:00
lsm: add the missing documentation for the security_skb_owned_by() hook
2013-04-10 15:40:39 -04:00
seqlock: Use seqcount infrastructure
2013-02-19 08:43:34 +01:00
sh_eth: add R-Car support for real
2013-03-29 15:31:30 -04:00
Fix breakage in MIPS siginfo handling
2013-03-19 19:15:52 +01:00
net: add function to allocate sk_buff head without data area
2013-04-19 14:57:57 -04:00
smp: make smp_call_function_many() use logic similar to smp_call_function_single()
2013-02-21 17:22:20 -08:00
stop_machine: Mark per cpu stopper enabled early
2013-02-26 22:25:17 +01:00
sock_diag: allow to dump bpf filters
2013-04-29 13:21:30 -04:00
NFC: llcp: Implement socket options
2013-03-10 22:20:05 +01:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
rtc: stmp3xxx: add wdt-accessor function
2013-03-01 12:40:36 +01:00
vmscan: change type of vm_total_pages to unsigned long
2013-02-23 17:50:22 -08:00
x86, kdump: Set crashkernel_low automatically
2013-04-17 12:35:32 -07:00
tcp: implement RFC5682 F-RTO
2013-03-21 11:47:51 -04:00
thermal: shorten too long mcast group name
2013-03-20 17:56:58 -04:00
arm-soc: cleanups
2013-02-21 14:58:40 -08:00
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
udp: add encap_destroy callback
2013-03-20 12:10:38 -04:00
userns: Restrict when proc and sysfs can be mounted
2013-03-27 07:50:08 -07:00
virtio: remove obsolete virtqueue_get_queue_index()
2013-03-22 10:23:34 -04:00
mm: don't wait on congested zones in balance_pgdat()
2013-02-23 17:50:15 -08:00
VSOCK: Split vm_sockets.h into kernel/uapi
2013-03-08 12:24:48 -05:00
mm: numa: handle side-effects in count_vm_numa_events() for !CONFIG_NUMA_BALANCING
2013-02-23 17:50:16 -08:00
watchdog: core: dt: add support for the timeout-sec dt property
2013-03-01 12:48:36 +01:00
