Linus Torvalds
aecdc33e11
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...
Pull networking changes from David Miller:
1) GRE now works over ipv6, from Dmitry Kozlov.
2) Make SCTP more network namespace aware, from Eric Biederman.
3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.
4) Make openvswitch network namespace aware, from Pravin B Shelar.
5) IPV6 NAT implementation, from Patrick McHardy.
6) Server side support for TCP Fast Open, from Jerry Chu and others.
7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel
Borkmann.
8) Increate the loopback default MTU to 64K, from Eric Dumazet.
9) Use a per-task rather than per-socket page fragment allocator for
outgoing networking traffic. This benefits processes that have very
many mostly idle sockets, which is quite common.
From Eric Dumazet.
10) Use up to 32K for page fragment allocations, with fallbacks to
smaller sizes when higher order page allocations fail. Benefits are
a) less segments for driver to process b) less calls to page
allocator c) less waste of space.
From Eric Dumazet.
11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.
12) VXLAN device driver, one way to handle VLAN issues such as the
limitation of 4096 VLAN IDs yet still have some level of isolation.
From Stephen Hemminger.
13) As usual there is a large boatload of driver changes, with the scale
perhaps tilted towards the wireless side this time around.
Fix up various fairly trivial conflicts, mostly caused by the user
namespace changes.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)
hyperv: Add buffer for extended info after the RNDIS response message.
hyperv: Report actual status in receive completion packet
hyperv: Remove extra allocated space for recv_pkt_list elements
hyperv: Fix page buffer handling in rndis_filter_send_request()
hyperv: Fix the missing return value in rndis_filter_set_packet_filter()
hyperv: Fix the max_xfer_size in RNDIS initialization
vxlan: put UDP socket in correct namespace
vxlan: Depend on CONFIG_INET
sfc: Fix the reported priorities of different filter types
sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP
sfc: Fix loopback self-test with separate_tx_channels=1
sfc: Fix MCDI structure field lookup
sfc: Add parentheses around use of bitfield macro arguments
sfc: Fix null function pointer in efx_sriov_channel_type
vxlan: virtual extensible lan
igmp: export symbol ip_mc_leave_group
netlink: add attributes to fdb interface
tg3: unconditionally select HWMON support when tg3 is enabled.
Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"
gre: fix sparse warning
...
2012-10-02 13:38:27 -07:00
serial: pl011: delete reset callback
2012-09-10 16:33:02 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2012-09-07 15:07:55 -04:00
ARM: bcm2835: add stub clock driver
2012-09-19 19:08:53 -06:00
extcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices
2012-09-05 12:20:49 -07:00
ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
2012-09-12 18:06:30 -07:00
iio:inkern: Add function to read the processed value
2012-09-17 21:48:51 +01:00
Input: MT - Get slot by key
2012-09-19 19:50:19 +02:00
ARM: bcm2835: add interrupt controller driver
2012-09-19 19:08:37 -06:00
ARM: soc: device tree updates
2012-10-01 18:28:06 -07:00
net/mlx4_core: Add security check / enforcement for flow steering rules set for VMs
2012-09-07 12:55:59 -04:00
mmc: card: Skip secure erase on MoviNAND; causes unrecoverable corruption.
2012-09-04 13:58:10 -04:00
netfilter: nfnetlink_queue: add NFQA_CAP_LEN attribute
2012-09-24 15:10:29 +02:00
netfilter: ip6tables: add stateless IPv6-to-IPv6 Network Prefix Translation target
2012-08-30 03:00:25 +02:00
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
ARM: soc: general cleanups
2012-10-01 18:19:05 -07:00
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next
2012-09-28 14:45:07 +01:00
SUNRPC: Fix a UDP transport regression
2012-09-07 11:43:49 -04:00
USB: EHCI: Tegra: Fix wrong register definition
2012-09-18 17:40:56 +01:00
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
2012-09-24 16:36:10 -06:00
ASoC: atmel-ssc: include linux/io.h for raw io
2012-08-28 10:14:01 -07:00
misc/atmel_tc: make atmel_tc.tcb_config member point to const data
2012-09-11 08:56:37 +02:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
usb/core: use bin2bcd() for bcdDevice in RH
2012-09-10 11:13:16 -07:00
ARM: bcm2835: add system timer
2012-09-19 19:08:46 -06:00
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-10-02 10:52:28 -07:00
cgroup: Wrap subsystem selection macro
2012-09-14 09:57:37 -07:00
clk: add of_clk_src_onecell_get() support
2012-09-07 18:30:19 -07:00
mm: compaction: Abort async compaction if locks are contended or taking too long
2012-08-21 16:45:03 -07:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
ARM: omap: allow building omap44xx without SMP
2012-08-23 17:16:42 +02:00
vfs: dcache: use DCACHE_DENTRY_KILLED instead of DCACHE_DISCONNECTED in d_kill()
2012-09-18 11:23:51 -07:00
device.h: Add missing inline to #ifndef CONFIG_PRINTK dev_vprintk_emit
2012-09-26 13:56:59 -07:00
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
Linux support for the 64-bit ARM architecture (AArch64)
2012-10-01 11:51:57 -07:00
etherdevice: introduce help function eth_zero_addr()
2012-09-10 15:49:54 -04:00
extcon: fixing typos
2012-09-05 12:18:11 -07:00
filter: add XOR instruction for use with X/K
2012-09-24 16:49:21 -04:00
powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
2012-09-24 13:42:45 -07:00
cputime: Use a proper subsystem naming for vtime related APIs
2012-09-25 15:31:31 +02:00
HID: sensors: introduce sensor framework
2012-09-06 19:13:13 +01:00
HID: sensors: introduce sensor framework
2012-09-06 19:13:13 +01:00
HID: Allow more fields in the hid report
2012-09-19 19:50:20 +02:00
Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO
2012-09-10 16:42:33 -07:00
i2c: pnx: Fix read transactions of >= 2 bytes
2012-09-12 17:52:44 +02:00
wireless: remove obsolete chan no/center freq conversion functions
2012-09-06 17:05:36 +02:00
vxlan: virtual extensible lan
2012-10-01 18:39:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-22 14:21:38 -07:00
vlan: add helper which can be called to see if device is used by vlan
2012-08-24 13:46:39 -04:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
Input: Send events one packet at a time
2012-09-19 19:50:18 +02:00
time: RCU permitted to stop idle entry via softirq
2012-09-23 07:42:52 -07:00
iommu: static inline iommu group stub functions
2012-09-25 12:14:56 +02:00
userns: Convert ipc to use kuid and kgid where appropriate
2012-09-06 22:17:20 -07:00
netfilter: nf_conntrack_ipv6: improve fragmentation handling
2012-08-30 03:00:10 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-22 14:21:38 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
kdb: Turn KGDB_KDB=n stubs into static inlines
2012-09-26 13:42:26 -07:00
linux/kernel.h: Fix warning seen with W=1 due to change in DIV_ROUND_CLOSEST
2012-09-19 06:51:25 -07:00
vtime: Consolidate system/idle context detection
2012-09-25 15:42:37 +02:00
userns: Convert security/keys to the new userns infrastructure
2012-09-13 18:28:02 -07:00
tty/serial: Add kgdb_nmi driver
2012-09-26 13:52:36 -07:00
kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
2012-09-06 10:13:58 -07:00
introduce kref_put_mutex()
2012-08-22 10:24:41 -04:00
cputime: Use a proper subsystem naming for vtime related APIs
2012-09-25 15:31:31 +02:00
userns: Convert loop to use kuid_t instead of uid_t
2012-09-21 03:13:20 -07:00
mdio: translation of MMD EEE registers to/from ethtool settings
2012-08-22 22:58:27 -07:00
mm/ia64: fix a memory block size bug
2012-09-17 15:00:37 -07:00
phy/micrel: Add missing header to micrel_phy.h
2012-09-24 15:54:33 -04:00
mISDN: Fix wrong usage of flush_work_sync while holding locks
2012-09-13 14:58:54 -04:00
ARM: soc: non-critical bug fixes
2012-10-01 18:02:07 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
netlink: Rearrange netlink_kernel_cfg to save space on 64-bit.
2012-09-23 02:09:23 -04:00
NFC: LLCP raw socket support
2012-09-27 10:47:59 +02:00
NFS: Fix the initialisation of the readdir 'cookieverf' array
2012-09-04 14:52:42 -04:00
NFSv4: Fix buffer overflow checking in __nfs4_get_acl_uncached
2012-09-06 11:11:53 -04:00
cfg80211/nl80211: Notify connection request failure in AP mode
2012-09-18 19:54:06 +02:00
of/irq: Create stub for of_irq_find_parent when !CONFIG_OF
2012-09-20 12:32:30 +02:00
of/mdio: Add dummy functions in of_mdio.h.
2012-08-30 12:37:52 -04:00
ARM: OMAP1: move lcd pdata out of arch/arm/*
2012-09-10 16:34:00 -07:00
PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
2012-09-24 14:51:23 -06:00
Merge branch 'pci/trivial' into next
2012-09-13 09:08:02 -06:00
serial: set correct baud_base for EXSYS EX-41092 Dual 16950
2012-09-26 13:35:12 -07:00
Merge branch 'pci/bjorn-find-next-ext-cap' into next
2012-08-23 18:32:36 -06:00
PCI: Make pci_error_handlers const
2012-09-07 16:24:59 -06:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:28:49 -07:00
userns: Convert vfs posix_acl support to use kuids and kgids
2012-09-18 01:01:35 -07:00
userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr
2012-09-18 01:01:35 -07:00
pps/ptp: Allow PHC devices to adjust PPS events for known delay
2012-09-07 21:13:28 +01:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
ptp: clarify the clock_name sysfs attribute
2012-09-22 15:42:46 -04:00
userns: Convert struct dquot dq_id to be a struct kqid
2012-09-18 01:01:41 -07:00
userns: Modify dqget to take struct kqid
2012-09-18 01:01:40 -07:00
rcu: Switch task's syscall hooks on context switch
2012-09-26 15:47:02 +02:00
regmap: irq: Add mask invert flag for enable register
2012-08-30 11:13:41 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
efifb: Skip DMI checks if the bootloader knows what it's doing
2012-09-17 13:29:23 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
serial: diminish usage of struct serial_uart_config
2012-09-05 13:15:07 -07:00
tty/serial/core: Introduce poll_init callback
2012-09-26 13:47:02 -07:00
serial: add OMAP-specific defines
2012-09-06 09:17:01 -07:00
xattr: extract simple_xattr code from tmpfs
2012-08-24 15:55:33 -07:00
tcp: TCP Fast Open Server - header & support functions
2012-08-31 20:02:18 -04:00
net:stmmac: Remove bus_id from mdio platform data.
2012-08-31 16:11:28 -04:00
task_work: task_work_add() should not succeed after exit_task_work()
2012-09-13 16:47:34 +02:00
ipv4: Don't add TCP-code in inet_sock_destruct
2012-09-20 17:12:27 -04:00
tcp: add generic netlink support for tcp_metrics
2012-09-05 15:15:02 -04:00
time: Move ktime_t overflow checking into timespec_valid_strict
2012-09-01 10:24:48 -07:00
trace: Don't declare trace_*_rcuidle functions in modules
2012-09-12 10:20:14 -04:00
userns: Convert taskstats to handle the user and pid namespaces.
2012-09-18 01:01:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
tty: move the async flags from the serial code into the tty includes
2012-09-05 13:11:03 -07:00
uprobes: Introduce arch_uprobe_enable/disable_step()
2012-09-15 17:37:28 +02:00
usb/acpi: Use ACPI methods to power off ports.
2012-09-10 13:04:01 -07:00
usb: remove libusual
2012-09-05 17:21:36 -07:00
usbfs: Add a new disconnect-and-claim ioctl (v2)
2012-09-10 11:10:37 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
xattr: extract simple_xattr code from tmpfs
2012-08-24 15:55:33 -07:00
xfrm_user: ensure user supplied esn replay window is valid
2012-09-20 18:08:40 -04:00
