Josh Triplett
bd5dc17be8
uts: make default hostname configurable, rather than always using "(none)" ...
The "hostname" tool falls back to setting the hostname to "localhost" if
/etc/hostname does not exist. Distribution init scripts have the same
fallback. However, if userspace never calls sethostname, such as when
booting with init=/bin/sh, or otherwise booting a minimal system without
the usual init scripts, the default hostname of "(none)" remains,
unhelpfully appearing in various places such as prompts ("root@(none):~#")
and logs. Furthermore, "(none)" doesn't typically resolve to anything
useful.
Make the default hostname configurable. This removes the need for the
standard fallback, provides a useful default for systems that never call
sethostname, and makes minimal systems that much more useful with less
configuration. Distributions could choose to use "localhost" here to
avoid the fallback, while embedded systems may wish to use a specific
target hostname.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: David Miller <davem@davemloft.net>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Kel Modderman <kel@otaku42.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-06-15 20:04:00 -07:00
bcma: add missing GPIO defines, use PULL register only when available
2011-05-11 14:50:41 -04:00
can: make struct can_proto const
2011-05-04 14:08:36 -07:00
ceph: use LOOKUPINO to make unconnected nfs fh more reliable
2011-05-24 11:52:05 -07:00
[media] DVB: Add basic API support for DVB-T2 and bump minor version
2011-05-20 18:51:09 -03:00
backlight: new driver for the ADP8870 backlight devices
2011-06-15 20:03:59 -07:00
input: Add support for Qualcomm PMIC8XXX power key
2011-05-26 19:45:54 +02:00
TPS65911: Comparator: Add comparator driver
2011-05-27 10:49:29 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
2011-05-25 16:55:55 -07:00
mtd: fix physmap.h warnings
2011-06-01 11:36:49 +01:00
netfilter: add more values to enum ip_conntrack_info
2011-06-06 01:35:10 +02:00
isp1704_charger: Allow board specific powering routine
2011-04-20 17:48:49 +04:00
regulator: Support voltage offsets to compensate for drops in system
2011-05-27 10:34:37 +01:00
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
2011-05-26 12:13:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd
2011-05-29 14:10:13 -07:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-05-23 12:33:02 -07:00
timers: Improve alarmtimer comments and minor fixes
2011-04-28 13:39:17 -07:00
ath9k_hw: Get AHB clock information from ath9k_platform_data
2011-04-25 14:50:08 -04:00
atomic: Add atomic_or()
2011-05-28 17:41:46 +02:00
gpio/basic_mmio: add missing include of spinlock_types.h
2011-06-10 08:46:26 -06:00
bit_spinlock: don't play preemption games inside the busy loop
2011-04-25 18:10:58 -07:00
bitmap, irq: add smp_affinity_list interface to /proc/irq
2011-05-25 08:39:45 -07:00
arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT}
2011-05-26 17:12:38 -07:00
block: get rid of on-stack plugging debug checks
2011-05-20 20:52:16 +02:00
block: remove unwanted semicolons
2011-05-31 13:45:53 +02:00
memblock/nobootmem: allow alloc_bootmem() to take 0 as low limit
2011-05-25 08:39:30 -07:00
lib: Add generic binary search function to the kernel.
2011-05-19 16:55:27 +09:30
vfs: Block mmapped writes while the fs is frozen
2011-05-26 07:26:45 -04:00
include/linux/c2port.h: remove wrong and never used macros
2011-05-25 08:39:43 -07:00
Merge branch 'next' into for-linus
2011-05-24 22:55:24 +10:00
cgroup: remove the ns_cgroup
2011-05-26 17:12:34 -07:00
cgroup: remove the ns_cgroup
2011-05-26 17:12:34 -07:00
mm: cleancache core ops functions and config
2011-05-26 10:01:36 -06:00
clockevents: Provide interface to reconfigure an active clock event device
2011-05-19 14:24:16 +02:00
clocksource: add common mmio clocksource
2011-05-23 18:04:51 +01:00
compat: include aio_abi.h for aio_context_t
2011-05-24 08:55:20 -04:00
sparse: define __must_be_array() for __CHECKER__
2011-05-25 08:39:46 -07:00
sparse: Undef __compiletime_{warning,error} if __CHECKER__ is defined
2011-05-25 08:39:47 -07:00
[CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.
2011-05-04 11:50:57 -04:00
bitmap, irq: add smp_affinity_list interface to /proc/irq
2011-05-25 08:39:45 -07:00
cpuset: Fix cpuset_cpus_allowed_fallback(), don't update tsk->rt.nr_cpus_allowed
2011-05-28 17:02:57 +02:00
fs/proc/vmcore.c: add hook to read_from_oldmem() to check for non-ram pages
2011-05-26 17:12:37 -07:00
Create Documentation/security/,
2011-05-19 15:59:38 -07:00
vfs: get rid of insane dentry hashing rules
2011-04-24 07:58:46 -07:00
dm table: allow targets to support discards internally
2011-05-29 12:52:55 +01:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-05-19 18:24:11 -07:00
dlm: make plock operation killable
2011-05-23 10:47:06 -05:00
dm io: use fixed initial mempool size
2011-05-29 13:03:09 +01:00
dm kcopyd: return client directly and not through a pointer
2011-05-29 13:03:13 +01:00
intel-iommu: Enable super page (2MiB, 1GiB, etc.) support
2011-06-01 12:26:35 +01:00
drbd: Fix spelling
2011-05-24 10:21:29 +02:00
drbd: Fix spelling
2011-05-24 10:21:29 +02:00
dmaengine/dw_dmac: Update maintainer-ship
2011-05-25 18:30:37 +05:30
x86, efi: Retain boot service code until after switching to virtual mode
2011-05-25 17:03:53 -07:00
ARM: 6882/1: ELF: Define new core note type for VFP registers
2011-05-14 21:36:55 +01:00
ethtool.h: fix typos
2011-06-09 15:05:48 -07:00
fs: pass exact type of data dirties to ->dirty_inode
2011-05-27 07:04:40 -04:00
fbcon: add lifetime refcount to opened frame buffers
2011-05-12 07:37:51 -07:00
net: filter: move forward declarations to avoid compile warnings
2011-05-22 21:01:22 -04:00
firewire: sbp2: parallelize login, reconnect, logout
2011-05-10 22:53:46 +02:00
flex_array: avoid divisions when accessing elements
2011-05-26 17:12:33 -07:00
vfs: reorganize 'struct inode' layout a bit
2011-06-08 15:18:19 -07:00
fscache: remove dead code under CONFIG_WORKQUEUE_DEBUGFS
2011-05-25 08:39:44 -07:00
USB: extend ehci-fsl and fsl_udc_core driver for OTG operation
2011-05-02 16:59:38 -07:00
ftrace: Modify ftrace_set_filter/notrace to take ops
2011-05-18 19:22:52 -04:00
tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine
2011-05-25 22:13:44 -04:00
lib/genalloc.c: add support for specifying the physical address
2011-05-25 08:39:54 -07:00
Revert "block: Remove extra discard_alignment from hd_struct."
2011-05-30 07:42:51 +02:00
include/linux/gfp.h: convert BUG_ON() into VM_BUG_ON()
2011-05-25 08:39:11 -07:00
gpio: make gpio_{request,free}_array gpio array parameter const
2011-05-27 17:56:45 -06:00
Input: gpio-keys - add support for setting device name
2011-04-11 23:53:19 -07:00
hrtimers: Reorder clock bases
2011-05-23 13:59:54 +02:00
mm: convert anon_vma->lock to a mutex
2011-05-25 08:39:19 -07:00
Fix build with !HUGETLBFS
2011-05-26 12:03:50 -07:00
mm: don't access vm_flags as 'int'
2011-05-26 09:20:31 -07:00
hwmon: (jc42) Change detection class
2011-05-25 20:43:32 +02:00
ide: Use linux/mutex.h
2011-05-08 16:41:45 -07:00
cfg80211: don't drop p2p probe responses
2011-06-01 14:34:01 -04:00
net: Kill ether_table[] declaration.
2011-05-27 13:40:54 -04:00
net: Allow setting the network namespace by fd
2011-05-10 14:36:03 -07:00
af_packet: prevent information leak
2011-06-06 22:42:06 -07:00
vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check
2011-06-11 16:15:50 -07:00
ftrace: Avoid recording mcount on .init sections directly
2011-05-16 14:46:30 -04:00
cgroups: read-write lock CLONE_THREAD forking per threadgroup
2011-05-26 17:12:34 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-04-18 13:29:03 -07:00
rcu: move TREE_RCU from softirq to kthread
2011-05-05 23:16:54 -07:00
ipmi: convert to seq_file interface
2011-05-26 17:12:37 -07:00
genirq: Add chip suspend and resume callbacks
2011-04-23 15:56:24 +02:00
genirq: Uninline and sanity check generic_handle_irq()
2011-05-18 14:59:08 +02:00
irq: Handle spurios irq detection for threaded irqs
2011-06-03 14:53:15 +02:00
jbd2: Add function jbd2_trans_will_send_data_barrier()
2011-05-24 11:59:18 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
2011-05-25 16:55:55 -07:00
BUILD_BUG_ON_ZERO: fix sparse breakage
2011-06-15 20:04:00 -07:00
Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs
2011-05-27 10:25:02 -07:00
Merge branch 'next' into for-linus
2011-05-24 22:55:24 +10:00
kmsg_dump.h: fix build when CONFIG_PRINTK is disabled
2011-06-15 20:03:59 -07:00
KVM: PPC: booke: add sregs support
2011-05-22 08:47:53 -04:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-05-23 15:39:34 -07:00
drivers/leds/leds-pca9532.c: add gpio capability
2011-05-25 08:39:50 -07:00
include/linux/leds-regulator.h: fix syntax in example code
2011-04-13 11:11:43 +02:00
leds: provide helper to register "leds-gpio" devices
2011-05-25 08:39:51 -07:00
libata: Power off empty ports
2011-05-19 20:50:53 -04:00
x86: Get rid of asmregparm
2011-05-24 14:33:35 +02:00
list: remove prefetching from regular list iterators
2011-05-19 14:15:29 -07:00
add hlist_bl_lock/unlock helpers
2011-04-25 18:14:10 -07:00
lockdep, mutex: provide mutex_lock_nest_lock
2011-05-25 08:39:17 -07:00
lru_cache.h: fix comments referring to ts_ instead of lc_
2011-05-24 10:01:37 +02:00
LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH
2011-04-25 18:14:07 -04:00
memblock: add error return when CONFIG_HAVE_MEMBLOCK is not set
2011-05-25 08:39:48 -07:00
vmscan,memcg: memcg aware swap token
2011-06-15 20:03:59 -07:00
mm: declare mpol_to_str() when CONFIG_TMPFS=n
2011-05-25 08:39:34 -07:00
mm: extract exe_file handling from procfs
2011-05-26 17:12:36 -07:00
mm: Fix boot crash in mm_alloc()
2011-05-29 11:32:28 -07:00
mm: convert anon_vma->lock to a mutex
2011-05-25 08:39:19 -07:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-05-27 19:51:32 -07:00
bcma: add Broadcom specific AMBA bus driver
2011-05-10 15:54:54 -04:00
module: Sort exported symbols
2011-05-19 16:55:27 +09:30
module: reorder kparam_array to remove alignment padding on 64 bit builds
2011-05-19 16:55:25 +09:30
ipv4: Pass explicit saddr/daddr args to ipmr_get_route().
2011-05-04 12:18:54 -07:00
lockdep, mutex: provide mutex_lock_nest_lock
2011-05-25 08:39:17 -07:00
mxm/wmi: add MXMX interface entry point.
2011-05-09 11:40:38 +10:00
net: Kill ratelimit.h dependency in linux/net.h
2011-05-27 13:41:33 -04:00
net: Rework netdev_drivername() to avoid warning.
2011-06-06 16:41:33 -07:00
net: Add linux/sysctl.h includes where needed.
2011-05-27 13:40:58 -04:00
RDMA: Add netlink infrastructure
2011-05-20 11:46:11 -07:00
Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd
2011-05-29 14:10:13 -07:00
NFSv4.1: Don't loop forever in nfs4_proc_create_session
2011-04-24 14:28:18 -04:00
NFSv4.1: change pg_test return type to bool
2011-05-29 20:56:54 +03:00
pnfs: layoutreturn
2011-05-29 20:54:36 +03:00
nilfs2: add ioctl which limits range of segment to be allocated
2011-05-10 22:21:45 +09:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-05-16 19:32:19 -04:00
watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
2011-05-23 11:58:59 +02:00
net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
2011-05-22 21:01:19 -04:00
cgroup: remove the ns_cgroup
2011-05-26 17:12:34 -07:00
drivercore: revert addition of of_match to struct device
2011-05-18 12:32:23 -06:00
of: Export of_irq_find_parent()
2011-04-20 17:01:19 +10:00
oom: replace PF_OOM_ORIGIN with toggling oom_score_adj
2011-05-25 08:39:10 -07:00
[S390] mm: fix storage key handling
2011-05-29 12:40:51 +02:00
readahead: readahead page allocations are OK to fail
2011-05-25 08:39:25 -07:00
PCI/e1000e: Add and use pci_disable_link_state_locked()
2011-05-21 12:16:44 -07:00
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2011-05-24 12:06:40 -07:00
Intel xhci: Add PCI id for Panther Point xHCI host.
2011-05-26 16:24:48 -07:00
PCI: add latency tolerance reporting enable/disable support
2011-05-11 15:18:53 -07:00
slub: always align cpu_slab to honor cmpxchg_double requirement
2011-06-03 19:33:49 +03:00
percpu_counter: change return value and add comments
2011-05-25 08:39:54 -07:00
perf: Fix comments in include/linux/perf_event.h
2011-06-04 12:31:14 +02:00
pid: fix typo in function description
2011-05-26 17:12:37 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-04-11 13:44:25 -07:00
PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"
2011-05-16 20:17:47 +02:00
PM: Introduce generic prepare and complete callbacks for subsystems
2011-05-17 23:26:21 +02:00
idle governor: Avoid lock acquisition to read pm_qos before entering idle
2011-05-29 00:50:59 -04:00
PM / Runtime: Generic clock manipulation rountines for runtime PM (v6)
2011-04-30 00:25:44 +02:00
pnfs-obj: pnfs_osd XDR definitions
2011-05-29 20:52:36 +03:00
treewide: fix a few typos in comments
2011-05-10 10:16:21 +02:00
posix-timers: RCU conversion
2011-05-24 12:10:51 +02:00
printk: allocate kernel log buffer earlier
2011-05-25 08:39:48 -07:00
mm: extract exe_file handling from procfs
2011-05-26 17:12:36 -07:00
pstore: fix pstore filesystem mount/remount issue
2011-05-16 11:05:00 -07:00
Intel PTI implementaiton of MIPI 1149.7.
2011-05-13 16:31:00 -07:00
ptp: Added a brand new class driver for ptp clocks.
2011-05-23 13:01:00 -07:00
ptp: Added a brand new class driver for ptp clocks.
2011-05-23 13:01:00 -07:00
ptp: Added a brand new class driver for ptp clocks.
2011-05-23 13:01:00 -07:00
ptrace: Prepare to fix racy accesses on task breakpoints
2011-04-25 17:28:24 +02:00
bug.h: Move ratelimit warn interfaces to ratelimit.h
2011-05-26 15:00:31 -04:00
timers: Add rb_init_node() to allow for stack allocated rb nodes
2011-04-26 14:01:42 -07:00
list: remove prefetching from regular list iterators
2011-05-19 14:15:29 -07:00
rcu: introduce kfree_rcu()
2011-05-05 23:16:59 -07:00
rcu: provide rcu_virt_note_context_switch() function.
2011-05-05 23:16:59 -07:00
rcu: provide rcu_virt_note_context_switch() function.
2011-05-05 23:16:59 -07:00
net: rfkill: add generic gpio rfkill driver
2011-05-19 13:53:54 -04:00
rfkill: Regulator consumer driver for rfkill
2011-04-19 15:38:02 -04:00
RapidIO/mpc85xx: fix possible mport registration problems
2011-04-14 16:06:56 -07:00
RapidIO: add IDT CPS-1432 switch definitions
2011-04-14 16:06:56 -07:00
mm: convert anon_vma->lock to a mutex
2011-05-25 08:39:19 -07:00
Input: rotary-encoder - add support for half-period encoders
2011-05-12 08:28:47 -07:00
drivers/rtc/rtc-mxc.c: remove defines already included in rtc.h
2011-05-26 17:12:33 -07:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-06-07 19:20:28 -07:00
SECURITY: Move exec_permission RCU checks into security modules
2011-04-25 10:20:32 -04:00
linux/seqlock.h should #include asm/processor.h for cpu_relax()
2011-06-11 13:17:28 -07:00
tty/serial: Add explicit PORT_TEGRA type
2011-05-19 16:51:01 -07:00
tty/serial: Fix break handling for PORT_TEGRA
2011-05-19 16:51:02 -07:00
tmpfs: implement generic xattr support
2011-05-25 08:39:31 -07:00
hwmon: (sht15) add support for CRC validation
2011-05-19 08:19:36 -07:00
Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
2011-05-20 13:33:21 -07:00
vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check
2011-06-11 16:15:50 -07:00
slub: Deal with hyperthetical case of PAGE_SIZE > 2M
2011-05-21 12:53:53 +03:00
Remove unused MSG_ flags in linux/smp.h
2011-05-26 13:38:58 +10:00
net: allow shifted access in smsc911x V2
2011-04-13 17:13:00 -07:00
net: Add sendmmsg socket system call
2011-05-05 11:10:14 -07:00
spinlock_up.h: include asm/processor.h in for cpu_relax
2011-05-20 12:51:07 -07:00
net/stmmac: Move "#include <linux/platform_device.h>" to linux/stmmac.h
2011-05-03 16:09:40 -07:00
Add a strtobool function matching semantics of existing in kernel equivalents
2011-05-19 16:55:28 +09:30
PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS
2011-04-11 22:54:42 +02:00
vmscan,memcg: memcg aware swap token
2011-06-15 20:03:59 -07:00
swiotlb: Export swioltb_nr_tbl and utilize it as appropiate.
2011-06-06 15:41:16 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd
2011-05-25 18:10:16 -07:00
PM: Remove sysdev suspend, resume and shutdown operations
2011-05-11 21:37:15 +02:00
sysfs: remove "last sysfs file:" line from the oops messages
2011-05-13 16:05:51 -07:00
hrtimers: Avoid touching inactive timer bases
2011-05-23 13:59:54 +02:00
drivers:misc:ti-st: handle delayed tty receive
2011-04-22 17:01:09 -07:00
timerfd: Manage cancelable timers in timerfd
2011-05-23 13:59:53 +02:00
timerfd: Manage cancelable timers in timerfd
2011-05-23 13:59:53 +02:00
timers: Add rb_init_node() to allow for stack allocated rb nodes
2011-04-26 14:01:42 -07:00
tipc: Abort excessive send requests as early as possible
2011-05-10 16:03:56 -04:00
mm: increase RECLAIM_DISTANCE to 30
2011-06-15 20:03:59 -07:00
Merge branch 'ptrace' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
2011-05-20 13:33:21 -07:00
n_tracerouter and n_tracesink ldisc additions.
2011-05-13 16:31:00 -07:00
Revert "tty: make receive_buf() return the amout of bytes received"
2011-06-04 06:33:24 +09:00
maccess,probe_kernel: Make write/read src const void *
2011-05-25 19:56:23 -04:00
USB: documentation update for the pre_reset method
2011-04-29 17:24:29 -07:00
usb-storage: redo incorrect reads
2011-06-07 09:05:42 -07:00
uts: make default hostname configurable, rather than always using "(none)"
2011-06-15 20:04:00 -07:00
[media] uvcvideo: Make the API public
2011-05-20 09:30:46 -03:00
[media] v4l: Add V4L2_MBUS_FMT_JPEG_1X8 media bus format
2011-05-20 11:28:49 -03:00
[media] v4l: Add M420 format definition
2011-05-20 12:17:35 -03:00
virtio: add api for delayed callbacks
2011-05-30 11:14:16 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio: add full three-clause BSD text to headers.
2011-05-30 11:14:14 +09:30
virtio ring: inline function to check for events
2011-05-30 11:14:14 +09:30
mm: move enum vm_event_item into a standalone header file
2011-05-26 17:12:34 -07:00
mm: move enum vm_event_item into a standalone header file
2011-05-26 17:12:34 -07:00
wl12xx: Handle platforms without level trigger interrupts
2011-04-19 16:49:20 +03:00
xattr.h: expose string defines to userspace
2011-05-25 08:39:45 -07:00
